diff --git a/ChangeLog b/ChangeLog
index ad7de682..4e540f05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+1999-01-09  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* configure.in (YEAR): Allow a 4-digit year for the version date,
+		so we can be Y2K politically correct.  (The date isn't
+		used for anything except display purposes, but it should
+		make people more comfortable to not use a 2-digit date,
+		even though it doesn't matter.)
+
 Mon Jan  4 02:36:23 1999  Theodore Y. Ts'o  <tytso@mit.edu>
 
 	* Makefile.in: Move the generated types.h file from the linux/
diff --git a/configure.in b/configure.in
index 6256b35c..a9b55671 100644
--- a/configure.in
+++ b/configure.in
@@ -13,7 +13,9 @@ DATE=`grep E2FSPROGS_DATE ${srcdir}/version.h | awk '{print $3}' \
 MONTH=`echo $DATE | awk -F- '{print $2}'`
 YEAR=`echo $DATE | awk -F- '{print $3}'`
 
-if expr $YEAR ">" 90 >/dev/null ; then
+if expr $YEAR ">" 1900 > /dev/null ; then
+	E2FSPROGS_YEAR=$YEAR
+elif expr $YEAR ">" 90 >/dev/null ; then
 	E2FSPROGS_YEAR=19$YEAR
 else
 	E2FSPROGS_YEAR=20$YEAR