Index: Makefile.in
--- Makefile.in.orig	2021-03-02 11:31:47.000000000 +0100
+++ Makefile.in	2021-03-03 08:25:04.403077000 +0100
@@ -366,7 +366,7 @@
 	$(AUTORECONF)
 	-rm -rf autom4te.cache .depend.bak
 
-install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config
+install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf host-key
 install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf
 install-nosysconf: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files
 
Index: auth-pam.c
--- auth-pam.c.orig	2021-03-02 11:31:47.000000000 +0100
+++ auth-pam.c	2021-03-03 08:25:04.403408000 +0100
@@ -69,7 +69,7 @@
 
 #if !defined(SSHD_PAM_SERVICE)
 extern char *__progname;
-# define SSHD_PAM_SERVICE		__progname
+# define SSHD_PAM_SERVICE		"openssh"
 #endif
 
 /* OpenGroup RFC86.0 and XSSO specify no "const" on arguments */
Index: configure
--- configure.orig	2021-03-02 13:05:37.000000000 +0100
+++ configure	2021-03-03 08:25:04.405068000 +0100
@@ -11528,7 +11528,6 @@
 	strmode \
 	strndup \
 	strnlen \
-	strnvis \
 	strptime \
 	strsignal \
 	strtonum \
Index: openbsd-compat/bsd-openpty.c
--- openbsd-compat/bsd-openpty.c.orig	2021-03-02 11:31:47.000000000 +0100
+++ openbsd-compat/bsd-openpty.c	2021-03-03 08:25:04.405272000 +0100
@@ -92,7 +92,7 @@
 	}
 	return (0);
 
-#elif defined(HAVE_DEV_PTMX)
+#elif defined(HAVE_DEV_PTMX) && defined(I_PUSH)
 	/*
 	 * This code is used e.g. on Solaris 2.x.  (Note that Solaris 2.3
 	 * also has bsd-style ptys, but they simply do not work.)
Index: version.h
--- version.h.orig	2021-03-02 11:31:47.000000000 +0100
+++ version.h	2021-03-03 08:25:04.405422000 +0100
@@ -3,4 +3,4 @@
 #define SSH_VERSION	"OpenSSH_8.5"
 
 #define SSH_PORTABLE	"p1"
-#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
+#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE " @l_openpkg_release@"