diff --git a/ChangeLog b/ChangeLog
index 603482dca4..8078d0e247 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-17  Roland McGrath  <roland@redhat.com>
+
+	* Makeconfig (CPPFLAGS): Fix last change to use $(libof-$(<F))
+	instead of $(libof-$<).
+
 2002-10-16  Roland McGrath  <roland@redhat.com>
 
 	* cppflags-iterator.mk (CPPFLAGS-$(cpp-src)): Variable removed.
diff --git a/Makeconfig b/Makeconfig
index b6a1b4aeb1..3ee4ece1fd 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -633,8 +633,8 @@ libio-include = -I$(..)libio
 CPPFLAGS = $($(subdir)-CPPFLAGS) $(+includes) $(defines) \
 	   -include $(..)include/libc-symbols.h $(sysdep-CPPFLAGS) \
 	   $(CPPFLAGS-$(suffix $@)) \
-	   $(foreach L,$(libof-$(basename $(@F))) $(libof-$<) $(libof-$(@F)),\
-		     $(CPPFLAGS-$L)) \
+	   $(foreach lib,$(libof-$(basename $(@F))) \
+		         $(libof-$(<F)) $(libof-$(@F)),$(CPPFLAGS-$(lib))) \
 	   $(CPPFLAGS-$(<F)) $(CPPFLAGS-$(@F)) $(CPPFLAGS-$(basename $(@F)))
 override CFLAGS	= -std=gnu99 \
 		  $(filter-out %frame-pointer,$(+cflags)) $(sysdep-CFLAGS) \