diff --git a/ChangeLog b/ChangeLog
index 04bf87d3bd..0e0839c300 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2000-03-19  Roland McGrath  <roland@baalperazim.frob.com>
 
+	* Makeconfig (soversion.i): Use only first match for each lib.
+
 	* Makeconfig (soversion.i): Pass -undef to $(CC) -E.
 
 	* Makerules (Versions.all, sysd-versions): Test $(sysd-sorted-done)
diff --git a/Makeconfig b/Makeconfig
index a74d4500bc..daae310cee 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -689,8 +689,11 @@ $(common-objpfx)soversions.i: $(..)shlib-versions $(..)Makeconfig \
 	    test `expr '$(config-machine)-$(config-vendor)-$(config-os)' \
 		       : "$$conf"` != 0 || continue; \
 	    lib=`echo $$version | sed 's/=.*$$//'`; \
-	    number=`echo $$version | sed "s/^.*=//"`; \
-	    echo $$lib $$number $$setname; \
+	    if eval test -z "\$${versioned_$${lib}}"; then \
+	      eval versioned_$${lib}=yes; \
+	      number=`echo $$version | sed "s/^.*=//"`; \
+	      echo $$lib $$number $$setname; \
+	    fi; \
 	  done > $@T; exit 0
 	mv -f $@T $@
 $(common-objpfx)soversions.mk: $(common-objpfx)soversions.i