diff --git a/ChangeLog b/ChangeLog
index 54a5646ee6..1d0ce6e433 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1999-11-12  Ulrich Drepper  <drepper@cygnus.com>
+
+	* configure.in: Allow user so specify --enable-kernel=current.
+
 1999-11-12  Thorsten Kukuk  <kukuk@suse.de>
 
 	* nis/nss_nisplus/nisplus-publickey.c: Check for snprintf return value.
diff --git a/configure.in b/configure.in
index 05c61cd9c1..cf18953f10 100644
--- a/configure.in
+++ b/configure.in
@@ -178,6 +178,10 @@ dnl Prevent unreasonable values.
 if test "$minimum_kernel" = yes || test "$minimum_kernel" = no; then
   # Better nothing than this.
   minimum_kernel=""
+else
+  if test "$minimum_kernel" = current; then
+    minimum_kernel=`uname -r 2>/dev/null` || minimum_kernel=
+  fi
 fi
 
 AC_CANONICAL_HOST