diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt
index b1b5d4f29e..2072007162 100644
--- a/Docs/Changelog_sm5.txt
+++ b/Docs/Changelog_sm5.txt
@@ -8,6 +8,10 @@ ________________________________________________________________________________
 StepMania 5.0 $next | 2011????
 --------------------------------------------------------------------------------
 
+2011/08/23
+----------
+* [Makefile.am] Fixed version date and time handling. [AJ]
+
 2011/08/22
 ----------
 * [PrefsManager, X11Helper] Added ShowMouseCursor preference. [AJ]
diff --git a/src/Makefile.am b/src/Makefile.am
index baa03078e4..d81f18c8be 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -36,8 +36,8 @@ increment_version:
 		build=0; \
 	fi; \
 	echo "extern const unsigned long version_num = $$build;" > ver.cpp; \
-	echo "extern const char *const version_time = \"`date`\";" >> ver.cpp;
-	echo "extern const char *const version_date = \"`date`\";" >> ver.cpp;
+	echo "extern const char *const version_time = \"`date +"%H:%M:%S"`\";" >> ver.cpp;
+	echo "extern const char *const version_date = \"`date +"%Y/%m/%d"`\";" >> ver.cpp;
 
 ver.cpp:
 	$(MAKE) increment_version