diff --git a/ChangeLog b/ChangeLog
index 7aa4b57..3ba3ba3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-17  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Speed up the linking step
+	* src/Makefile.in: Use -objectlist for linking libcln.la.
+
 2005-05-15  Richard B. Kreckel  <kreckel@ginac.de>
 
 	* autoconf/ltmain.sh: Upgrade to libtool-1.5.16.
diff --git a/src/Makefile.in b/src/Makefile.in
index 7d7bf23..885f27f 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -203,7 +203,8 @@ ifeq ($(SUBDIR),.)
 $(ALLOBJECTS_LO) : $(SUBDIRS_TARGET)
 
 libcln.la : $(LIBTOOL) $(ALLOBJECTS_LO)
-	$(LIBTOOL_LINK) $(CXX) -o libcln.la -rpath $(libdir) -version-info $(CL_CURRENT):$(CL_REVISION):$(CL_AGE) $(LDFLAGS) $(LIBS) $(ALLOBJECTS_LO)
+	echo $(ALLOBJECTS_LO) | tr ' ' '\n' > libcln.objectlist
+	$(LIBTOOL_LINK) $(CXX) -o libcln.la -rpath $(libdir) -version-info $(CL_CURRENT):$(CL_REVISION):$(CL_AGE) $(LDFLAGS) $(LIBS) -objectlist libcln.objectlist
 
 install : all force
 	$(MKDIR) $(DESTDIR)$(libdir)
@@ -225,7 +226,7 @@ check : all
 mostlyclean : clean
 
 clean : force
-	$(RM) *.s *.o *.lo *.a *.la core
+	$(RM) *.s *.o *.lo *.a *.la *.objectlist core
 	$(RM) -r .libs _libs
 
 distclean : clean