diff --git a/configure.ac b/configure.ac
index e8eea4e6d..cedb4c01f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -764,16 +764,16 @@ if test -d "$srcdir/.git"; then
 #ifndef VERSION_HIDDEN
 #define VERSION_HIDDEN
 #endif
-VERSION_HIDDEN const char *heimdal_long_version = "@([#])\$Version: $PACKAGE_STRING by @USER@ on @HOST@ @BRANCH@ @TAG@ ($host) @COMMIT@ @DATE@ \$";
-VERSION_HIDDEN const char *heimdal_version = "AC_PACKAGE_STRING";
+VERSION_HIDDEN const char *const heimdal_long_version = "@([#])\$Version: $PACKAGE_STRING by @USER@ on @HOST@ @BRANCH@ @TAG@ ($host) @COMMIT@ @DATE@ \$";
+VERSION_HIDDEN const char *const heimdal_version = "AC_PACKAGE_STRING";
 EOF
 else
     cat > include/newversion.h.in <<EOF
 #ifndef VERSION_HIDDEN
 #define VERSION_HIDDEN
 #endif
-VERSION_HIDDEN const char *heimdal_long_version = "@([#])\$Version: $PACKAGE_STRING by @USER@ on @HOST@ ($host) @DATE@ \$";
-VERSION_HIDDEN const char *heimdal_version = "AC_PACKAGE_STRING";
+VERSION_HIDDEN const char *const heimdal_long_version = "@([#])\$Version: $PACKAGE_STRING by @USER@ on @HOST@ ($host) @DATE@ \$";
+VERSION_HIDDEN const char *const heimdal_version = "AC_PACKAGE_STRING";
 EOF
 fi
 
diff --git a/include/NTMakefile b/include/NTMakefile
index 284ceba7e..8308d6e37 100644
--- a/include/NTMakefile
+++ b/include/NTMakefile
@@ -111,8 +111,8 @@ while(<>) {
 
 $(INCDIR)\version.h: ..\windows\NTMakefile.version NTMakefile
 	$(CP) << $@
-const char *heimdal_long_version = "@(#)$$Version: $(VER_PACKAGE_NAME) $(VER_PACKAGE_VERSION) by $(USERNAME) on $(COMPUTERNAME) ($(CPU)-pc-windows) $$";
-const char *heimdal_version = "$(VER_PACKAGE_NAME) $(VER_PACKAGE_VERSION)";
+const char *const heimdal_long_version = "@(#)$$Version: $(VER_PACKAGE_NAME) $(VER_PACKAGE_VERSION) by $(USERNAME) on $(COMPUTERNAME) ($(CPU)-pc-windows) $$";
+const char *const heimdal_version = "$(VER_PACKAGE_NAME) $(VER_PACKAGE_VERSION)";
 <<
 
 all:: $(INCFILES)
diff --git a/lib/krb5/krb5.h b/lib/krb5/krb5.h
index eb9f18046..593d1a366 100644
--- a/lib/krb5/krb5.h
+++ b/lib/krb5/krb5.h
@@ -697,7 +697,7 @@ typedef struct {
     KRB_ERROR error;
 } krb5_kdc_rep;
 
-extern const char *heimdal_version, *heimdal_long_version;
+extern const char *const heimdal_version, *const heimdal_long_version;
 
 typedef void (KRB5_CALLCONV * krb5_log_log_func_t)(krb5_context,
 						   const char*,
diff --git a/lib/vers/make-print-version.c b/lib/vers/make-print-version.c
index f0a61f641..5a2d13dd8 100644
--- a/lib/vers/make-print-version.c
+++ b/lib/vers/make-print-version.c
@@ -39,7 +39,7 @@
 #include <string.h>
 
 #ifdef KRB5
-extern const char *heimdal_version;
+extern const char *const heimdal_version;
 #endif
 #include <version.h>