--- openssh/scp.c.orig	Fri Sep  1 11:19:24 2000
+++ openssh/scp.c	Fri Sep  1 12:30:13 2000
@@ -85,6 +85,9 @@
 /* Name of current file being transferred. */
 char *curfile;
 
+/* This is set to non-zero if protocol v2 is desired. */
+int force_v2 = 0;
+
 /* This is set to non-zero if IPv4 is desired. */
 int IPv4 = 0;
 
@@ -165,6 +168,8 @@
 		args[i++] = ssh_program;
 		args[i++] = "-x";
 		args[i++] = "-oFallBackToRsh no";
+		if (force_v2)
+			args[i++] = "-2";
 		if (IPv4)
 			args[i++] = "-4";
 		if (IPv6)
@@ -262,9 +267,12 @@
 	extern int optind;
 
 	fflag = tflag = 0;
-	while ((ch = getopt(argc, argv, "dfprtvBCc:i:P:q46S")) != EOF)
+	while ((ch = getopt(argc, argv, "dfprtvBCc:i:P:q246S")) != EOF)
 		switch (ch) {
 		/* User-visible flags. */
+		case '2':
+			force_v2 = 1;
+			break;
 		case '4':
 			IPv4 = 1;
 			break;
@@ -961,7 +969,7 @@
 usage()
 {
 	(void) fprintf(stderr, "usage: scp "
-	    "[-pqrvC46] [-S ssh] [-P port] [-c cipher] [-i identity] f1 f2; or:\n"
+	    "[-pqrvC246] [-S ssh] [-P port] [-c cipher] [-i identity] f1 f2; or:\n"
 	    "       scp [options] f1 ... fn directory\n");
 	exit(1);
 }
--- openssh/scp.1.orig	Fri Sep  1 11:56:41 2000
+++ openssh/scp.1	Fri Sep  1 12:00:04 2000
@@ -19,7 +19,7 @@
 .Nd secure copy (remote file copy program)
 .Sh SYNOPSIS
 .Nm scp
-.Op Fl pqrvC46
+.Op Fl pqrvC246
 .Op Fl P Ar port
 .Op Fl c Ar cipher
 .Op Fl i Ar identity_file
@@ -108,6 +108,10 @@
 understand
 .Xr ssh 1
 options.
+.It Fl 2
+Forces
+.Nm
+to try protocol version 2 only.
 .It Fl 4
 Forces
 .Nm
