diff --git a/server/session.py b/server/session.py
index 1a3355e..a59c9a8 100644
--- a/server/session.py
+++ b/server/session.py
@@ -288,10 +288,11 @@ class ElectrumX(SessionBase):
         minor, revision = divmod(minor, 10000)
         revision //= 100
         daemon_version = '{:d}.{:d}.{:d}'.format(major, minor, revision)
+        server_version = version.VERSION.split()[-1]
         for pair in [
-                ('$VERSION', version.SUB_VERSION), # legacy
-                ('$SERVER_VERSION', version.VERSION),
-                ('$SERVER_SUBVERSION', version.SUB_VERSION),
+                ('$VERSION', version.VERSION), # legacy
+                ('$SERVER_VERSION', server_version),
+                ('$SERVER_SUBVERSION', version.VERSION),
                 ('$DAEMON_VERSION', daemon_version),
                 ('$DAEMON_SUBVERSION', network_info['subversion']),
                 ('$DONATION_ADDRESS', self.env.donation_address),
diff --git a/server/version.py b/server/version.py
index bcce393..cdab28f 100644
--- a/server/version.py
+++ b/server/version.py
@@ -1,6 +1,5 @@
 # Server name and protocol versions
 
-VERSION = '1.0.10'
-SUB_VERSION = 'ElectrumX {}'.format(VERSION)
+VERSION = 'ElectrumX 1.0.10'
 PROTOCOL_MIN = '1.0'
 PROTOCOL_MAX = '1.0'