diff --git a/ChangeLog b/ChangeLog
index c3aff9637e..3ff917ac25 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-05-20  Roland McGrath  <roland@frob.com>
+
+	* Makeconfig (sysdep-makeconfigs): Include any Makeconfig files
+	found within $(add-ons) directories too.
+	[linuxthreads add-on]: Move variable settings for linuxthreads
+	to new file linuxthreads/Makeconfig.
+
 2001-05-20  Franz Sirl  <Franz.Sirl-kernel@lauterbach.com>
 
 	* sysdeps/unix/sysv/linux/kernel-features.h (__ASSUME_STD_AUXV):
diff --git a/Makeconfig b/Makeconfig
index 996b971d61..26884f82d2 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -806,13 +806,6 @@ endif
 
 endif # build-shared
 
-ifneq (,$(findstring linuxthreads,$(add-ons)))
-shared-thread-library = $(common-objpfx)linuxthreads/libpthread.so
-static-thread-library = $(common-objpfx)linuxthreads/libpthread.a
-bounded-thread-library = $(common-objpfx)linuxthreads/libpthread_b.a
-have-thread-library = yes
-rpath-dirs += linuxthreads
-endif
 
 ifeq ($(elf),yes)
 dlfcn = dlfcn
@@ -880,7 +873,9 @@ $(common-objpfx)sysd-sorted: $(..)scripts/gen-sorted.awk $(all-Depend-files) \
 endif
 
 # Let sysdeps/ subdirs contain a Makeconfig fragment for us to include here.
-sysdep-makeconfigs := $(wildcard $(full_config_sysdirs:=/Makeconfig))
+sysdep-makeconfigs := $(wildcard $(patsubst %,$(..)%/Makeconfig,\
+					    $(config-sysdirs) $(add-ons)))
+
 ifneq (,$(sysdep-makeconfigs))
 include $(sysdep-makeconfigs)
 endif
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index d746ee31dd..f10ad91531 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,6 +1,10 @@
+2001-05-20  Roland McGrath  <roland@frob.com>
+
+	* Makeconfig: New file, variables used to be in main libc Makeconfig.
+
 2001-05-09  Geoff Keating  <geoffk@redhat.com>
 
-	* sysdeps/powerpc/pt-machine.h 
+	* sysdeps/powerpc/pt-machine.h
 	(HAS_COMPARE_AND_SWAP_WITH_RELEASE_SEMANTICS): Define.
 	(__compare_and_swap): Remove memory barriers.
 	(__compare_and_swap_with_release_semantics): New function.