diff --git a/ChangeLog b/ChangeLog
index fe3049b6ed..7c9474fbc5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-01  Daniel Jacobowitz  <dan@debian.org>
+
+	* sysdeps/unix/sysv/linux/dl-osinfo.h (_dl_discover_osversion): Don't
+	parse more than three parts of the version number.
+
 2007-09-15  Ulrich Drepper  <drepper@redhat.com>
 
 	* stdio-common/vfscanf.c (_IO_vfwscanf): Add support for 'm'
diff --git a/sysdeps/unix/sysv/linux/dl-osinfo.h b/sysdeps/unix/sysv/linux/dl-osinfo.h
index e3c605e4c7..082790f63b 100644
--- a/sysdeps/unix/sysv/linux/dl-osinfo.h
+++ b/sysdeps/unix/sysv/linux/dl-osinfo.h
@@ -121,7 +121,7 @@ _dl_discover_osversion (void)
       version <<= 8;
       version |= here;
 
-      if (*cp++ != '.')
+      if (*cp++ != '.' || parts == 3)
 	/* Another part following?  */
 	break;
     }