diff --git a/Globals/Globals.cpp b/Globals/Globals.cpp
index 0852f95..e8c32a1 100644
--- a/Globals/Globals.cpp
+++ b/Globals/Globals.cpp
@@ -27,7 +27,7 @@
 
 #define FEATURES "+GPRS "
 
-const char *gVersionString = "release " VERSION FEATURES PROD_CAT " built " __DATE__ " rev" SVN_REV " ";
+const char *gVersionString = "release " VERSION FEATURES PROD_CAT " built " TIMESTAMP_ISO " rev" SVN_REV " ";
 
 const char* gOpenBTSWelcome =
 	//23456789123456789223456789323456789423456789523456789623456789723456789
@@ -35,7 +35,7 @@ const char* gOpenBTSWelcome =
 	"Copyright 2008, 2009, 2010 Free Software Foundation, Inc.\n"
 	"Copyright 2010 Kestrel Signal Processing, Inc.\n"
 	"Copyright 2011, 2012, 2013, 2014 Range Networks, Inc.\n"
-	"Release " VERSION " " PROD_CAT " formal build date " __DATE__ " rev" SVN_REV "\n"
+	"Release " VERSION " " PROD_CAT " formal build date " TIMESTAMP_ISO " rev" SVN_REV "\n"
 	"\"OpenBTS\" is a registered trademark of Range Networks, Inc.\n"
 	"\nContributors:\n"
 	"  Range Networks, Inc.:\n"
diff --git a/Makefile.common b/Makefile.common
index f6b688b..0436180 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -18,6 +18,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+CXXFLAGS := -g -O2 -DTIMESTAMP_ISO=`date +'"%Y-%m-%dT%H:%M:%S"'`
+CFLAGS := -g -O2 -DTIMESTAMP_ISO=`date +'"%Y-%m-%dT%H:%M:%S"'`
+
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(USB_INCLUDES) $(WITH_INCLUDES) $(OPENBTS_CPPFLAGS)
 AM_CXXFLAGS = -Wall -pthread -ldl $(OPENBTS_CXXFLAGS)