diff --git a/Makefile.am b/Makefile.am
index d91467b3f..04f6b6081 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,7 +23,7 @@ BUILT_SOURCES = include/serno.h
 
 include/serno.h:
 	@if [ -d .git ] ; then \
-		revh=`git log -1 --date=short --pretty=format:%cd_%h 2>/dev/null | sed -e s/-//g -e s/_/-/`;\
+		revh=`git log -1 --date=format:%Y%m%d --pretty=format:%cd-%h`;\
 		[ -z "$$revh" ] || echo '#define SERNO "'$$revh'"' >include/serno.h ; \
 	elif [ -d .hg ] ; then \
 		revh=`hg parents --template '{date|shortdate}_{node|short}' 2>/dev/null | sed -e s/-//g -e s/_/-/`;\
diff --git a/configure.ac b/configure.ac
index b542dac65..c68be64f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -577,7 +577,7 @@ AC_HELP_STRING([--with-topiclen=NUMBER],[Set the max topic length to NUMBER (def
 AC_DEFINE_UNQUOTED(TOPICLEN, ${TOPICLEN}, [Maximum topic length (<=390)])
 AC_DEFINE_UNQUOTED(NICKLEN, (${NICKLEN}+1), [Nickname length])
 
-# rpath, for finding libratbox.so at run time
+# rpath, for finding librb.so at run time
 hold_ldflags=$LDFLAGS
 AC_MSG_CHECKING(for the ld -rpath flag)
 LDFLAGS="${LDFLAGS} -Wl,-rpath=${libdir}"
diff --git a/librb/Makefile.am b/librb/Makefile.am
index 245174b86..bcfd61553 100644
--- a/librb/Makefile.am
+++ b/librb/Makefile.am
@@ -9,7 +9,7 @@ BUILT_SOURCES = include/serno.h
 
 include/serno.h:
 	@if [ -d .git ] ; then \
-		revh=`git log -1 --date=short --pretty=format:%cd_%h 2>/dev/null | sed -e s/-//g -e s/_/-/`;\
+		revh=`git log -1 --date=format:%Y%m%d --pretty=format:%cd-%h`;\
 		[ -z "$$revh" ] || echo '#define SERNO "'$$revh'"' >include/serno.h ; \
 	elif [ -d .hg ] ; then \
 		revh=`hg parents --template '{date|shortdate}_{node|short}' 2>/dev/null | sed -e s/-//g -e s/_/-/`;\