diff --git a/html/inc/server_version.inc b/html/inc/server_version.inc
index 98e56f9f536..6fc68000b33 100644
--- a/html/inc/server_version.inc
+++ b/html/inc/server_version.inc
@@ -3,6 +3,8 @@
 // the server code release number (major/minor/release).
 // Update this when you do a server release.
 
+// This should agree with version.h
+
 // public releases have even minor #,
 // and are assumed to have a branch on github.
 // dev versions (e.g. master) have an odd minor #
diff --git a/sched/sched_types.cpp b/sched/sched_types.cpp
index f0364018376..069c6bc2401 100644
--- a/sched/sched_types.cpp
+++ b/sched/sched_types.cpp
@@ -24,6 +24,7 @@
 #include <string>
 #include <cstring>
 
+#include "version.h"
 #include "parse.h"
 #include "error_numbers.h"
 #include "str_util.h"
@@ -766,7 +767,7 @@ int SCHEDULER_REPLY::write(FILE* fout, SCHEDULER_REQUEST& sreq) {
         "Content-type: text/xml\n\n"
         "<scheduler_reply>\n"
         "<scheduler_version>%d</scheduler_version>\n",
-        BOINC_MAJOR_VERSION*100+BOINC_MINOR_VERSION
+        SERVER_MAJOR_VERSION*100+SERVER_MINOR_VERSION
     );
     if (sreq.core_client_version >= 70028) {
         fprintf(fout, "<dont_use_dcf/>\n");
diff --git a/version.h b/version.h
index 9ec61e773c4..50e751b670c 100644
--- a/version.h
+++ b/version.h
@@ -3,24 +3,24 @@
 #ifndef BOINC_VERSION_H
 #define BOINC_VERSION_H
 
-/* Major part of BOINC version number */
+/* client version number */
 #define BOINC_MAJOR_VERSION 7
-
-/* Minor part of BOINC version number */
 #define BOINC_MINOR_VERSION 17
-
-/* Release part of BOINC version number */
 #define BOINC_RELEASE 0
+#define BOINC_VERSION_STRING "7.17.0"
 
-/* Release part of wrapper version number */
+/* server version: must match html/inc/server_version.inc */
+#define SERVER_MAJOR_VERSION 1
+#define SERVER_MINOR_VERSION 1
+#define SERVER_RELEASE 0
+#define SERVER_VERSION_STRING "1.1.0"
+
+/* wrapper version number */
 #define WRAPPER_RELEASE 26016
 
-/* Release part of vboxwrapper version number */
+/* vboxwrapper version number */
 #define VBOXWRAPPER_RELEASE 26202
 
-/* String representation of BOINC version number */
-#define BOINC_VERSION_STRING "7.17.0"
-
 /* Package is a pre-release (Alpha/Beta) package */
 #define BOINC_PRERELEASE 1