3 files changed, 8 insertions, 3 deletions

diff --git a/sshconnect.c b/sshconnect.c
index 7ce2716cf..3280b310d 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -517,7 +517,7 @@ send_client_banner(int connection_out, int minor1)
 {
         /* Send our own protocol version identification. */
         xasprintf(&client_version_string, "SSH-%d.%d-%.100s\r\n",
-            PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION);
+            PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE);
         if (atomicio(vwrite, connection_out, client_version_string,
             strlen(client_version_string)) != strlen(client_version_string))
                 fatal("write: %.100s", strerror(errno));
diff --git a/sshd.c b/sshd.c
index af1ec3376..eccf81bbe 100644
--- a/sshd.c
+++ b/sshd.c
@@ -378,7 +378,7 @@ sshd_exchange_identification(struct ssh *ssh, int sock_in, int sock_out)
         char remote_version[256];       /* Must be at least as big as buf. */
 
         xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s\r\n",
-            PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION,
+            PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE,
             *options.version_addendum == '\0' ? "" : " ",
             options.version_addendum);
 
diff --git a/version.h b/version.h
index e093f623b..b7c5ad2a0 100644
--- a/version.h
+++ b/version.h
@@ -3,4 +3,9 @@
 #define SSH_VERSION     "OpenSSH_7.6"
 
 #define SSH_PORTABLE    "p1"
-#define SSH_RELEASE     SSH_VERSION SSH_PORTABLE
+#define SSH_RELEASE_MINIMUM     SSH_VERSION SSH_PORTABLE
+#ifdef SSH_EXTRAVERSION
+#define SSH_RELEASE     SSH_RELEASE_MINIMUM " " SSH_EXTRAVERSION
+#else
+#define SSH_RELEASE     SSH_RELEASE_MINIMUM
+#endif