diff --git a/Makefile.in b/Makefile.in
index 41dbacb..fa21a91 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -402,7 +402,7 @@
 		$(INSTALL_DATA) Modules/Makefile $(LIBPL)/Makefile
 		$(INSTALL_DATA) Modules/Setup $(LIBPL)/Setup
 		$(INSTALL_DATA) Modules/Setup.local $(LIBPL)/Setup.local
-		$(INSTALL_DATA) Modules/Setup.thread $(LIBPL)/Setup.thread
+		$(INSTALL_DATA) Modules/Setup.config $(LIBPL)/Setup.config
 		$(INSTALL_PROGRAM) $(srcdir)/Modules/makesetup $(LIBPL)/makesetup
 		$(INSTALL_PROGRAM) $(srcdir)/install-sh $(LIBPL)/install-sh
 		$(INSTALL_DATA) $(srcdir)/Misc/Makefile.pre.in $(LIBPL)/Makefile.pre.in
diff --git a/Misc/Makefile.pre.in b/Misc/Makefile.pre.in
index 6d9190d..ca68576 100644
--- a/Misc/Makefile.pre.in
+++ b/Misc/Makefile.pre.in
@@ -168,7 +168,7 @@
 MAKEFILE=	$(LIBPL)/Makefile
 CONFIGC=	$(LIBPL)/config.c
 CONFIGCIN=	$(LIBPL)/config.c.in
-SETUP=		$(LIBPL)/Setup.thread $(LIBPL)/Setup.local $(LIBPL)/Setup
+SETUP=		$(LIBPL)/Setup.config $(LIBPL)/Setup.local $(LIBPL)/Setup
 
 SYSLIBS=	$(LIBM) $(LIBC)
 
diff --git a/Modules/Makefile.pre.in b/Modules/Makefile.pre.in
index 2e307df..acb4664 100644
--- a/Modules/Makefile.pre.in
+++ b/Modules/Makefile.pre.in
@@ -147,10 +147,10 @@
 # gets remade from scratch; this ensures to remove modules that are no
 # longer pertinent (but that were in a previous configuration).
 config.c Makefile: Makefile.pre config.c.in $(MAKESETUP)
-config.c Makefile: Setup.thread Setup Setup.local
+config.c Makefile: Setup.config Setup Setup.local
 config.c Makefile:
 		-rm -f $(LIBRARY)
-		$(SHELL) $(MAKESETUP) Setup.thread Setup.local Setup
+		$(SHELL) $(MAKESETUP) Setup.config Setup.local Setup
 
 hassignal:
 		-rm -f hassignal