diff --git a/ChangeLog b/ChangeLog
index ff102b8..b1a8dcf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2003-05-18  Bruno Haible  <bruno@clisp.org>
 
+	* Version 1.9 released.
+
+2003-05-18  Bruno Haible  <bruno@clisp.org>
+
+	* lib/Makefile.in (libiconv_plug_osf.so): Avoid using LIBTOOL_LINK.
+
+2003-05-18  Bruno Haible  <bruno@clisp.org>
+
 	* lib/Makefile.msvc (DEBUGFLAGS): New variable.
 	(iconv.lib): Use it.
 	* src/Makefile.msvc (DEBUGFLAGS): New variable.
@@ -7,10 +15,6 @@
 
 2003-05-17  Bruno Haible  <bruno@clisp.org>
 
-	* Version 1.9 released.
-
-2003-05-17  Bruno Haible  <bruno@clisp.org>
-
 	* src/Makefile.msvc (libdir, datadir, localedir): New variables.
 	(IIlibdir, IIdatadir, IIlocaledir): New variables.
 	(CFLAGS): Define LOCALEDIR.
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 378e120..51a8c98 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -80,8 +80,12 @@
 	if test -n "@GCC@"; then \
 	  $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -fPIC -DPIC -DLIBICONV_PLUG $(SOURCES) -shared -o libiconv_plug_osf.so; \
 	else \
-	  $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -DPIC -DLIBICONV_PLUG $(SOURCES) -c -o iconv_plug.o; \
-	  /bin/ld -shared -expect_unresolved \* -o libiconv_plug_osf.so iconv_plug.o; \
+	  mkdir objects; \
+	  for f in $(SOURCES); do \
+	    $(CC) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -DPIC -DLIBICONV_PLUG -c $$f -o objects/`basename $$f | sed -e 's,\.c$$,.o,'`; \
+	  done; \
+	  /bin/ld -shared -expect_unresolved \* -o libiconv_plug_osf.so objects/*.o; \
+	  rm -rf objects; \
 	fi
 
 iconv.lo : $(srcdir)/iconv.c $(srcdir)/converters.h $(srcdir)/encodings.def $(srcdir)/encodings_aix.def $(srcdir)/encodings_osf1.def $(srcdir)/encodings_dos.def $(srcdir)/encodings_local.def $(srcdir)/aliases.h $(srcdir)/aliases_aix.h $(srcdir)/aliases_osf1.h $(srcdir)/aliases_dos.h $(srcdir)/flags.h