Index: Makefile.in
===================================================================
--- Makefile.in	(revision 6d7c3df325fb89c7b5983d4c2ac7e87d491411ba)
+++ Makefile.in	(revision 47a8d178de8d1c55043270cb9cc2b5a0ee3600ea)
@@ -132,4 +132,5 @@
 CFA_PREFIX = @CFA_PREFIX@
 CFLAGS = @CFLAGS@
+CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
Index: config.h.in
===================================================================
--- config.h.in	(revision 6d7c3df325fb89c7b5983d4c2ac7e87d491411ba)
+++ config.h.in	(revision 47a8d178de8d1c55043270cb9cc2b5a0ee3600ea)
@@ -19,4 +19,16 @@
 #undef CFA_PREFIX
 
+/* Major.Minor */
+#undef CFA_VERSION
+
+/* Build version number. */
+#undef CFA_VERSION_BUILD
+
+/* Major.Minor.Patch.Build */
+#undef CFA_VERSION_FULL
+
+/* Major.Minor.Patch */
+#undef CFA_VERSION_LONG
+
 /* Major version number. */
 #undef CFA_VERSION_MAJOR
@@ -27,4 +39,7 @@
 /* Patch version number. */
 #undef CFA_VERSION_PATCH
+
+/* Major */
+#undef CFA_VERSION_SHORT
 
 /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
Index: configure
===================================================================
--- configure	(revision 6d7c3df325fb89c7b5983d4c2ac7e87d491411ba)
+++ configure	(revision 47a8d178de8d1c55043270cb9cc2b5a0ee3600ea)
@@ -646,4 +646,5 @@
 CFA_BACKEND_CC
 BACKEND_CC
+CONFIG_STATUS_DEPENDENCIES
 MAINT
 MAINTAINER_MODE_FALSE
@@ -2964,12 +2965,54 @@
 			# may require auto* software to be installed
 
-
-$as_echo "#define CFA_VERSION_MAJOR \"1\"" >>confdefs.h
-
-
-$as_echo "#define CFA_VERSION_MINOR \"0\"" >>confdefs.h
-
-
-$as_echo "#define CFA_VERSION_PATCH \"0\"" >>confdefs.h
+ver_major=`cat version | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)/\1/'`
+ver_minor=`cat version | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)/\2/'`
+ver_patch=`cat version | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)/\3/'`
+ver_build=`cat version | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)/\4/'`
+ver_short="\"${ver_major}\""
+ver__long="\"${ver_major}.${ver_minor}\""
+ver__norm="\"${ver_major}.${ver_minor}.${ver_patch}\""
+ver__full="\"${ver_major}.${ver_minor}.${ver_patch}.${ver_build}\""
+
+CONFIG_STATUS_DEPENDENCIES='$(top_srcdir)/version'
+
+
+cat >>confdefs.h <<_ACEOF
+#define CFA_VERSION_MAJOR ${ver_major}
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define CFA_VERSION_MINOR ${ver_minor}
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define CFA_VERSION_PATCH ${ver_patch}
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define CFA_VERSION_BUILD ${ver_build}
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define CFA_VERSION_SHORT ${ver_short}
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define CFA_VERSION ${ver__long}
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define CFA_VERSION_LONG ${ver__norm}
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define CFA_VERSION_FULL ${ver__full}
+_ACEOF
 
 
Index: configure.ac
===================================================================
--- configure.ac	(revision 6d7c3df325fb89c7b5983d4c2ac7e87d491411ba)
+++ configure.ac	(revision 47a8d178de8d1c55043270cb9cc2b5a0ee3600ea)
@@ -18,7 +18,22 @@
 AM_MAINTAINER_MODE(enable)			# may require auto* software to be installed
 
-AC_DEFINE(CFA_VERSION_MAJOR, "1", [Major version number.])
-AC_DEFINE(CFA_VERSION_MINOR, "0", [Minor version number.])
-AC_DEFINE(CFA_VERSION_PATCH, "0", [Patch version number.])
+ver_major=`cat version | sed -r 's/([[0-9]]+)\.([[0-9]]+)\.([[0-9]]+)\.([[0-9]]+)/\1/'`
+ver_minor=`cat version | sed -r 's/([[0-9]]+)\.([[0-9]]+)\.([[0-9]]+)\.([[0-9]]+)/\2/'`
+ver_patch=`cat version | sed -r 's/([[0-9]]+)\.([[0-9]]+)\.([[0-9]]+)\.([[0-9]]+)/\3/'`
+ver_build=`cat version | sed -r 's/([[0-9]]+)\.([[0-9]]+)\.([[0-9]]+)\.([[0-9]]+)/\4/'`
+ver_short="\"${ver_major}\""
+ver__long="\"${ver_major}.${ver_minor}\""
+ver__norm="\"${ver_major}.${ver_minor}.${ver_patch}\""
+ver__full="\"${ver_major}.${ver_minor}.${ver_patch}.${ver_build}\""
+
+AC_SUBST([CONFIG_STATUS_DEPENDENCIES], ['$(top_srcdir)/version'])
+AC_DEFINE_UNQUOTED(CFA_VERSION_MAJOR, ${ver_major}, [Major version number.])
+AC_DEFINE_UNQUOTED(CFA_VERSION_MINOR, ${ver_minor}, [Minor version number.])
+AC_DEFINE_UNQUOTED(CFA_VERSION_PATCH, ${ver_patch}, [Patch version number.])
+AC_DEFINE_UNQUOTED(CFA_VERSION_BUILD, ${ver_build}, [Build version number.])
+AC_DEFINE_UNQUOTED(CFA_VERSION_SHORT, ${ver_short}, [Major])
+AC_DEFINE_UNQUOTED(CFA_VERSION, ${ver__long}, [Major.Minor])
+AC_DEFINE_UNQUOTED(CFA_VERSION_LONG, ${ver__norm}, [Major.Minor.Patch])
+AC_DEFINE_UNQUOTED(CFA_VERSION_FULL, ${ver__full}, [Major.Minor.Patch.Build])
 
 # Installation paths
Index: src/Makefile.in
===================================================================
--- src/Makefile.in	(revision 6d7c3df325fb89c7b5983d4c2ac7e87d491411ba)
+++ src/Makefile.in	(revision 47a8d178de8d1c55043270cb9cc2b5a0ee3600ea)
@@ -266,4 +266,5 @@
 CFA_PREFIX = @CFA_PREFIX@
 CFLAGS = @CFLAGS@
+CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
Index: src/driver/Makefile.am
===================================================================
--- src/driver/Makefile.am	(revision 6d7c3df325fb89c7b5983d4c2ac7e87d491411ba)
+++ src/driver/Makefile.am	(revision 47a8d178de8d1c55043270cb9cc2b5a0ee3600ea)
@@ -6,5 +6,5 @@
 ## file "LICENCE" distributed with Cforall.
 ##
-## Makefile.am -- 
+## Makefile.am --
 ##
 ## Author           : Peter A. Buhr
@@ -26,3 +26,6 @@
 cc1_SOURCES = cc1.cc
 
+cfa.cc : ${abs_top_srcdir}/version
+	@true
+
 MAINTAINERCLEANFILES = @CFA_PREFIX@/bin/${bin_PROGRAMS} @CFA_PREFIX@/lib/${cc1lib_PROGRAMS}
Index: src/driver/Makefile.in
===================================================================
--- src/driver/Makefile.in	(revision 6d7c3df325fb89c7b5983d4c2ac7e87d491411ba)
+++ src/driver/Makefile.in	(revision 47a8d178de8d1c55043270cb9cc2b5a0ee3600ea)
@@ -100,4 +100,5 @@
 CFA_PREFIX = @CFA_PREFIX@
 CFLAGS = @CFLAGS@
+CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -542,4 +543,7 @@
 
 
+cfa.cc : ${abs_top_srcdir}/version
+	@true
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
Index: src/driver/cfa.cc
===================================================================
--- src/driver/cfa.cc	(revision 6d7c3df325fb89c7b5983d4c2ac7e87d491411ba)
+++ src/driver/cfa.cc	(revision 47a8d178de8d1c55043270cb9cc2b5a0ee3600ea)
@@ -25,4 +25,5 @@
 using std::endl;
 using std::string;
+using std::to_string;
 
 
@@ -50,6 +51,6 @@
 
 int main( int argc, char *argv[] ) {
-	string Version( VERSION );							// current version number from CONFIG
-	string Major( CFA_VERSION_MAJOR ), Minor( CFA_VERSION_MINOR ), Patch( CFA_VERSION_MINOR );
+	string Version( CFA_VERSION_LONG );							// current version number from CONFIG
+	string Major( to_string( CFA_VERSION_MAJOR ) ), Minor( to_string( CFA_VERSION_MINOR ) ), Patch( to_string( CFA_VERSION_PATCH ) );
 
 	string installincdir( CFA_INCDIR );					// fixed location of include files
Index: src/examples/Makefile.in
===================================================================
--- src/examples/Makefile.in	(revision 6d7c3df325fb89c7b5983d4c2ac7e87d491411ba)
+++ src/examples/Makefile.in	(revision 47a8d178de8d1c55043270cb9cc2b5a0ee3600ea)
@@ -111,4 +111,5 @@
 # applies to both programs
 CFLAGS = -g -Wall -Wno-unused-function # TEMPORARY: does not build with -O2
+CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
Index: src/libcfa/Makefile.in
===================================================================
--- src/libcfa/Makefile.in	(revision 6d7c3df325fb89c7b5983d4c2ac7e87d491411ba)
+++ src/libcfa/Makefile.in	(revision 47a8d178de8d1c55043270cb9cc2b5a0ee3600ea)
@@ -137,4 +137,5 @@
 CFA_PREFIX = @CFA_PREFIX@
 CFLAGS = -quiet -no-include-stdhdr -g -Wall -Wno-unused-function @CFA_FLAGS@ -B${abs_top_srcdir}/src/driver -XCFA -t # TEMPORARY: does not build with -O2
+CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
Index: src/tests/Makefile.in
===================================================================
--- src/tests/Makefile.in	(revision 6d7c3df325fb89c7b5983d4c2ac7e87d491411ba)
+++ src/tests/Makefile.in	(revision 47a8d178de8d1c55043270cb9cc2b5a0ee3600ea)
@@ -121,4 +121,5 @@
 # applies to both programs
 CFLAGS = -g -Wall -Wno-unused-function @CFA_FLAGS@ # TEMPORARY: does not build with -O2
+CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
Index: version
===================================================================
--- version	(revision 47a8d178de8d1c55043270cb9cc2b5a0ee3600ea)
+++ version	(revision 47a8d178de8d1c55043270cb9cc2b5a0ee3600ea)
@@ -0,0 +1,1 @@
+1.0.0.0