Index: Makefile.in
--- Makefile.in.orig	2025-10-06 04:25:16.000000000 +0200
+++ Makefile.in	2025-10-06 20:15:18.515788000 +0200
@@ -412,7 +412,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: openbsd-compat/bsd-openpty.c
--- openbsd-compat/bsd-openpty.c.orig	2025-10-06 04:25:16.000000000 +0200
+++ openbsd-compat/bsd-openpty.c	2025-10-06 20:15:18.515888000 +0200
@@ -68,7 +68,7 @@
 #define O_NOCTTY 0
 #endif
 
-#if defined(HAVE_DEV_PTMX) && !defined(HAVE__GETPTY)
+#if defined(HAVE_DEV_PTMX) && !defined(HAVE__GETPTY) && defined(I_PUSH)
 static int
 openpty_streams(int *amaster, int *aslave)
 {
Index: session.c
--- session.c.orig	2025-10-06 04:25:16.000000000 +0200
+++ session.c	2025-10-06 20:15:18.516154000 +0200
@@ -116,6 +116,10 @@
 	  c[sizeof(INTERNAL_SFTP_NAME) - 1] == ' ' || \
 	  c[sizeof(INTERNAL_SFTP_NAME) - 1] == '\t'))
 
+#ifndef SCPBINDIR
+#define SCPBINDIR "@l_prefix@/bin"
+#endif
+
 /* func */
 
 Session *session_new(void);
@@ -632,6 +636,20 @@
 	int ret;
 	const char *forced = NULL, *tty = NULL;
 	char session_type[1024];
+	char *scp_command = NULL;
+
+	if (   command != NULL
+		&& strlen(command) >= 3
+		&& strncmp(command, "scp", 3) == 0
+		&& (command[3] == ' ' || command[3] == '\0')) {
+		size_t l, k;
+		l = strlen(SCPBINDIR);
+		k = strlen(command);
+		scp_command = xmalloc(l+1+k+1);
+		snprintf(scp_command, l+1+k+1, "%s/%s", SCPBINDIR, command);
+		command = (const char *)scp_command;
+		debug("Forced SCP command '%.900s'", command);
+	}
 
 	if (options.adm_forced_command) {
 		original_command = command;
@@ -694,6 +712,8 @@
 		ret = do_exec_no_pty(ssh, s, command);
 
 	original_command = NULL;
+	if (scp_command != NULL)
+		free(scp_command);
 
 	/*
 	 * Clear loginmsg: it's the child's responsibility to display
Index: version.h
--- version.h.orig	2025-10-06 20:15:18.516228000 +0200
+++ version.h	2025-10-06 20:16:10.860936000 +0200
@@ -3,4 +3,4 @@
 #define SSH_VERSION	"OpenSSH_10.1"
 
 #define SSH_PORTABLE	"p1"
-#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
+#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE " @l_openpkg_release@"
