diff --git a/ChangeLog b/ChangeLog
index b2fcd4af12..d32f4fa5a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2005-07-21  Roland McGrath  <roland@redhat.com>
 
+	* nscd/Makefile ($(objpfx)nscd): Pass $(nscd-cflags) to $(LINK.o).
+
 	* stdlib/Makefile (headers): Move bits/wchar.h to ...
 	* wcsmbs/Makefile (headers): ... here.  Add bits/wchar2.h too.
 
diff --git a/nscd/Makefile b/nscd/Makefile
index 5a2d29a0a5..b7d5f3400b 100644
--- a/nscd/Makefile
+++ b/nscd/Makefile
@@ -122,7 +122,7 @@ relro-LDFLAGS += -Wl,-z,now
 endif
 
 $(objpfx)nscd: $(addprefix $(objpfx),$(nscd-modules:=.o))
-	$(LINK.o) -pie -Wl,-O1 \
+	$(LINK.o) -pie -Wl,-O1 $(nscd-cflags) \
 	  $(sysdep-LDFLAGS) $(config-LDFLAGS) $(relro-LDFLAGS) \
 	  $(extra-B-$(@F:lib%.so=%).so) -B$(csu-objpfx) \
 	  $(extra-B-$(@F:lib%.so=%).so) $(load-map-file) \