diff --git a/acinclude.m4 b/acinclude.m4
index e6ff161e4..d84e77c19 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -81,9 +81,9 @@ AC_DEFUN([GB_INIT_AUTOMAKE],
   AC_DEFINE(GAMBAS_VERSION_STRING, "GB_VERSION_MAJOR", Gambas version string)
   AC_DEFINE(GAMBAS_FULL_VERSION_STRING, "GB_VERSION_MAJOR.GB_VERSION_MINOR", Gambas full version string)
 
-  AC_DEFINE(GAMBAS_FULL_VERSION, 0x03100090, [Full Gambas version])
-  AC_DEFINE(GAMBAS_PCODE_VERSION, 0x03080000, [Gambas bytecode version])
-  AC_DEFINE(GAMBAS_PCODE_VERSION_MIN, 0x03000000, [Minimum Gambas bytecode version])
+  AC_DEFINE(GAMBAS_FULL_VERSION, GB_VERSION_FULL, [Full Gambas version])
+  AC_DEFINE(GAMBAS_PCODE_VERSION, GB_PCODE_VERSION, [Gambas bytecode version])
+  AC_DEFINE(GAMBAS_PCODE_VERSION_MIN, GB_PCODE_VERSION_MIN, [Minimum Gambas bytecode version])
 
   GB_CLEAR_MESSAGES
 ])
diff --git a/version.m4 b/version.m4
index 788989b48..025e2b1db 100644
--- a/version.m4
+++ b/version.m4
@@ -7,3 +7,8 @@ m4_define([GB_URL], [http://gambas.sourceforge.net])
 m4_define([GB_VERSION_MAJOR], [3])
 m4_define([GB_VERSION_MINOR], [10])
 m4_define([GB_VERSION_RELEASE], [90])
+
+m4_define([GB_VERSION_FULL], [0x03100090])
+m4_define([GB_PCODE_VERSION], [0x03080000])
+m4_define([GB_PCODE_VERSION_MIN],[0x03000000])
+