diff --git a/iconv/Makefile b/iconv/Makefile
index c0bb2a0f3b..214941b91e 100644
--- a/iconv/Makefile
+++ b/iconv/Makefile
@@ -38,6 +38,7 @@ vpath %.c ../locale/programs
 
 iconv_prog-modules = iconv_charmap charmap charmap-dir linereader \
 		     dummy-repertoire simple-hash xstrdup xmalloc
+extra-objs	   = $(iconv_prog-modules:=.o)
 CFLAGS-iconv_prog.c = -I../locale/programs
 CFLAGS-iconv_charmap.c = -I../locale/programs
 CFLAGS-dummy-repertoire.c = -I../locale/programs
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 3086b63971..0f6ce4725d 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,7 @@
+2001-02-10  Andreas Jaeger  <aj@suse.de>
+
+	* Makefile (extra-objs): New.
+
 2001-02-09  Jakub Jelinek  <jakub@redhat.com>
 
 	* sysdeps/pthread/pt-initfini.c (call_initialize_minimal): Add
diff --git a/linuxthreads/Makefile b/linuxthreads/Makefile
index 9c80a0088c..a3bd5d16ae 100644
--- a/linuxthreads/Makefile
+++ b/linuxthreads/Makefile
@@ -48,6 +48,7 @@ include ../Makeconfig
 
 ifeq ($(build-shared),yes)
 before-compile := $(objpfx)crti.o
+extra-objs = crti.o
 
 CFLAGS-pt-initfini.s = -g0 -fPIC -fno-inline-functions
 endif