diff -up openssh-6.1p1/configure.ac.vendor openssh-6.1p1/configure.ac

--- openssh-6.1p1/configure.ac.vendor	2012-09-14 20:36:49.153085211 +0200

+++ openssh-6.1p1/configure.ac	2012-09-14 20:36:49.559088133 +0200

@@ -4303,6 +4303,12 @@ AC_ARG_WITH([lastlog],

 		fi

 	]

 )

+AC_ARG_ENABLE(vendor-patchlevel,

+  [  --enable-vendor-patchlevel=TAG  specify a vendor patch level],

+  [AC_DEFINE_UNQUOTED(SSH_VENDOR_PATCHLEVEL,[SSH_RELEASE "-" "$enableval"],[Define to your vendor patch level, if it has been modified from the upstream source release.])

+   SSH_VENDOR_PATCHLEVEL="$enableval"],

+  [AC_DEFINE(SSH_VENDOR_PATCHLEVEL,SSH_RELEASE,[Define to your vendor patch level, if it has been modified from the upstream source release.])

+   SSH_VENDOR_PATCHLEVEL=none])

 dnl lastlog, [uw]tmpx? detection

 dnl  NOTE: set the paths in the platform section to avoid the

@@ -4529,6 +4535,7 @@ echo "           Translate v4 in v6 hack

 echo "                  BSD Auth support: $BSD_AUTH_MSG"

 echo "              Random number source: $RAND_MSG"

 echo "             Privsep sandbox style: $SANDBOX_STYLE"

+echo "                Vendor patch level: $SSH_VENDOR_PATCHLEVEL"

 echo ""

diff -up openssh-6.1p1/servconf.c.vendor openssh-6.1p1/servconf.c

--- openssh-6.1p1/servconf.c.vendor	2012-09-14 20:36:49.124085002 +0200

+++ openssh-6.1p1/servconf.c	2012-09-14 20:50:34.995972516 +0200

@@ -128,6 +128,7 @@ initialize_server_options(ServerOptions

 	options->max_authtries = -1;

 	options->max_sessions = -1;

 	options->banner = NULL;

+	options->show_patchlevel = -1;

 	options->use_dns = -1;

 	options->client_alive_interval = -1;

 	options->client_alive_count_max = -1;

@@ -289,6 +290,9 @@ fill_default_server_options(ServerOption

 		options->ip_qos_bulk = IPTOS_THROUGHPUT;

 	if (options->version_addendum == NULL)

 		options->version_addendum = xstrdup("");

+	if (options->show_patchlevel == -1)

+		options->show_patchlevel = 0;

+

 	/* Turn privilege separation on by default */

 	if (use_privsep == -1)

 		use_privsep = PRIVSEP_NOSANDBOX;

@@ -326,7 +330,7 @@ typedef enum {

 	sIgnoreUserKnownHosts, sCiphers, sMacs, sProtocol, sPidFile,

 	sGatewayPorts, sPubkeyAuthentication, sXAuthLocation, sSubsystem,

 	sMaxStartups, sMaxAuthTries, sMaxSessions,

-	sBanner, sUseDNS, sHostbasedAuthentication,

+	sBanner, sShowPatchLevel, sUseDNS, sHostbasedAuthentication,

 	sHostbasedUsesNameFromPacketOnly, sClientAliveInterval,

 	sClientAliveCountMax, sAuthorizedKeysFile,

 	sGssAuthentication, sGssCleanupCreds, sAcceptEnv, sPermitTunnel,

@@ -441,6 +445,7 @@ static struct {

 	{ "maxauthtries", sMaxAuthTries, SSHCFG_ALL },

 	{ "maxsessions", sMaxSessions, SSHCFG_ALL },

 	{ "banner", sBanner, SSHCFG_ALL },

+	{ "showpatchlevel", sShowPatchLevel, SSHCFG_GLOBAL },

 	{ "usedns", sUseDNS, SSHCFG_GLOBAL },

 	{ "verifyreversemapping", sDeprecated, SSHCFG_GLOBAL },

 	{ "reversemappingcheck", sDeprecated, SSHCFG_GLOBAL },

@@ -1162,6 +1167,10 @@ process_server_config_line(ServerOptions

 		multistate_ptr = multistate_privsep;

 		goto parse_multistate;

+	case sShowPatchLevel:

+		intptr = &options->show_patchlevel;

+		goto parse_flag;

+

 	case sAllowUsers:

 		while ((arg = strdelim(&cp)) && *arg != '\0') {

 			if (options->num_allow_users >= MAX_ALLOW_USERS)

@@ -1956,6 +1965,7 @@ dump_config(ServerOptions *o)

 	dump_cfg_fmtint(sUseLogin, o->use_login);

 	dump_cfg_fmtint(sCompression, o->compression);

 	dump_cfg_fmtint(sGatewayPorts, o->gateway_ports);

+	dump_cfg_fmtint(sShowPatchLevel, o->show_patchlevel);

 	dump_cfg_fmtint(sUseDNS, o->use_dns);

 	dump_cfg_fmtint(sAllowTcpForwarding, o->allow_tcp_forwarding);

 	dump_cfg_fmtint(sUsePrivilegeSeparation, use_privsep);

diff -up openssh-6.1p1/servconf.h.vendor openssh-6.1p1/servconf.h

--- openssh-6.1p1/servconf.h.vendor	2012-09-14 20:36:49.125085009 +0200

+++ openssh-6.1p1/servconf.h	2012-09-14 20:36:49.564088168 +0200

@@ -140,6 +140,7 @@ typedef struct {

 	int	max_authtries;

 	int	max_sessions;

 	char   *banner;			/* SSH-2 banner message */

+	int	show_patchlevel;	/* Show vendor patch level to clients */

 	int	use_dns;

 	int	client_alive_interval;	/*

 					 * poke the client this often to

diff -up openssh-6.1p1/sshd_config.vendor openssh-6.1p1/sshd_config

--- openssh-6.1p1/sshd_config.vendor	2012-09-14 20:36:49.507087759 +0200

+++ openssh-6.1p1/sshd_config	2012-09-14 20:36:49.565088175 +0200

@@ -114,6 +114,7 @@ UsePrivilegeSeparation sandbox		# Defaul

 #Compression delayed

 #ClientAliveInterval 0

 #ClientAliveCountMax 3

+#ShowPatchLevel no

 #UseDNS yes

 #PidFile /var/run/sshd.pid

 #MaxStartups 10

diff -up openssh-6.1p1/sshd_config.0.vendor openssh-6.1p1/sshd_config.0

--- openssh-6.1p1/sshd_config.0.vendor	2012-09-14 20:36:49.510087780 +0200

+++ openssh-6.1p1/sshd_config.0	2012-09-14 20:36:49.567088190 +0200

@@ -558,6 +558,11 @@ DESCRIPTION

              Defines the number of bits in the ephemeral protocol version 1

              server key.  The minimum value is 512, and the default is 1024.

+     ShowPatchLevel

+	     Specifies whether sshd will display the specific patch level of

+	     the binary in the server identification string.  The patch level

+	     is set at compile-time.  The default is M-bM-^@M-^\noM-bM-^@M-^].

+

      StrictModes

              Specifies whether sshd(8) should check file modes and ownership

              of the user's files and home directory before accepting login.

diff -up openssh-6.1p1/sshd_config.5.vendor openssh-6.1p1/sshd_config.5

--- openssh-6.1p1/sshd_config.5.vendor	2012-09-14 20:36:49.512087794 +0200

+++ openssh-6.1p1/sshd_config.5	2012-09-14 20:36:49.568088198 +0200

@@ -978,6 +978,14 @@ This option applies to protocol version

 .It Cm ServerKeyBits

 Defines the number of bits in the ephemeral protocol version 1 server key.

 The minimum value is 512, and the default is 1024.

+.It Cm ShowPatchLevel 

+Specifies whether 

+.Nm sshd 

+will display the patch level of the binary in the identification string. 

+The patch level is set at compile-time. 

+The default is 

+.Dq no . 

+This option applies to protocol version 1 only. 

 .It Cm StrictModes

 Specifies whether

 .Xr sshd 8

diff -up openssh-6.1p1/sshd.c.vendor openssh-6.1p1/sshd.c

--- openssh-6.1p1/sshd.c.vendor	2012-09-14 20:36:49.399086981 +0200

+++ openssh-6.1p1/sshd.c	2012-09-14 20:47:30.696088744 +0200

@@ -433,7 +433,7 @@ sshd_exchange_identification(int sock_in

 	}

 	xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s%s",

-	    major, minor, SSH_VERSION,

+	    major, minor, (options.show_patchlevel == 1) ? SSH_VENDOR_PATCHLEVEL : SSH_VERSION,

 	    *options.version_addendum == '\0' ? "" : " ",

 	    options.version_addendum, newline);

@@ -1635,7 +1635,8 @@ main(int ac, char **av)

 		exit(1);

 	}

-	debug("sshd version %.100s", SSH_RELEASE);

+	debug("sshd version %.100s",

+	      (options.show_patchlevel == 1) ? SSH_VENDOR_PATCHLEVEL : SSH_RELEASE);

 	/* Store privilege separation user for later use if required. */

 	if ((privsep_pw = getpwnam(SSH_PRIVSEP_USER)) == NULL) {