diff --git a/autogen.sh b/autogen.sh
index 418b124d..d575b146 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -34,7 +34,7 @@ perl syntax.pl
 # otherwise the log will have local timezone
 SVN=svn
 if test -f $srcdir/ChangeLog; then
-	CHANGELOG_VERSION=`head -n 2 $srcdir/ChangeLog| tail -1 | sed 's/^r\([0-9]*\).*/\1/'`
+	CHANGELOG_VERSION=`head -n 2 $srcdir/ChangeLog| grep '^r' | sed 's/^r\([0-9]*\).*/\1/'`
 fi
 if test -z $CHANGELOG_VERSION; then
 	echo "Getting ChangeLog from svn..."
diff --git a/configure.in b/configure.in
index f3b8a14d..1405bf48 100644
--- a/configure.in
+++ b/configure.in
@@ -913,8 +913,8 @@ fi
 dnl **
 dnl ** IRSSI_VERSION_DATE and IRSSI_VERSION_TIME
 dnl **
-VERSION_DATE=`head -n 2 $srcdir/ChangeLog| tail -1 | awk '{print $5}' | tr -d '-'`
-VERSION_TIME=`head -n 2 $srcdir/ChangeLog| tail -1 | awk '{print $6}' | awk -F: '{printf "%d\n", $1$2}'`
+VERSION_DATE=`head -n 2 $srcdir/ChangeLog| grep '^r' | awk '{print $5}' | tr -d '-'`
+VERSION_TIME=`head -n 2 $srcdir/ChangeLog| grep '^r' | awk '{print $6}' | awk -F: '{printf "%d\n", $1$2}'`
 AC_SUBST(VERSION_DATE)
 AC_SUBST(VERSION_TIME)