diff --git a/ChangeLog b/ChangeLog
index 76391807f2..5654308636 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2000-03-27  Roland McGrath  <roland@baalperazim.frob.com>
 
+	* include/shlib-compat.h (SHLIB_COMPAT): Make the test handle the
+	obsoleting version not being defined at all, in which case the
+	result is always true.
+
 	* Makeconfig (preprocess-versions): New canned sequence for running
 	cpp on shlib-versions and the like.
 	(soversions.i): Use it.
diff --git a/include/shlib-compat.h b/include/shlib-compat.h
index 7f66cbead5..a95c1e0806 100644
--- a/include/shlib-compat.h
+++ b/include/shlib-compat.h
@@ -44,7 +44,8 @@
    in the GLIBC_2.0 version and obsoleted in the GLIBC_2.2 version.  */
 
 # define SHLIB_COMPAT(lib, introduced, obsoleted) \
-  (ABI_##lib##_##introduced < ABI_##lib##_##obsoleted)
+  (!(ABI_##lib##_##obsoleted - 0) \
+   || ((ABI_##lib##_##introduced - 0) < (ABI_##lib##_##obsoleted - 0)))
 
 /* That header also defines symbols like `VERSION_libm_GLIBC_2_1' to
    the version set name to use for e.g. symbols first introduced into