diff --git a/ChangeLog b/ChangeLog
index 931f1cd89d..be5ffcef43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 Tue Jul  2 10:44:37 1996  Roland McGrath  <roland@delasyd.gnu.ai.mit.edu>
 
+	* rpm/template (%build): Use @prefix@ instead of always /usr.
+	Set up configparms only if @prefix@ is in fact /usr.
+	* rpm/Makefile ($(config)): Substitute $(prefix) for @prefix@.
+
 	* elf/Makefile: Add missing endif.
 
 	* nss/nss_files/files-ethers.c (ntohost): Fix db key.
diff --git a/rpm/Makefile b/rpm/Makefile
index 148a3a19d6..22544506f6 100644
--- a/rpm/Makefile
+++ b/rpm/Makefile
@@ -64,7 +64,9 @@ instvars = include lib bin sbin data others
 # Generate the rpm spec file for this configuration.
 $(config): template $(distinfo) Makefile
 	rm -f $@.new
-	(sed -e 's%@VERSION@%$(version)%g' $<; \
+	(sed -e 's%@VERSION@%$(version)%g' \
+	     -e 's%@prefix@%$(prefix)%g' \
+	     $<; \
 	 ($(foreach var,$(instvars),\
 	  list='$(install-$(var))'; \
 	  for f in $$list; do \
diff --git a/rpm/template b/rpm/template
index f4c2e9f7d7..7b03ed5ab2 100644
--- a/rpm/template
+++ b/rpm/template
@@ -10,11 +10,13 @@ Source: glibc-@VERSION@.tar.gz
 %setup
 
 %build
-configure --prefix=/usr
-cat >configparms <<EOF
+configure --prefix=@prefix@
+if test x@prefix@ = /usr; then
+  cat >configparms <<EOF
 slibdir=/lib
 sysconfdir=/etc
 EOF
+fi
 make
 
 %install