diff --git a/ChangeLog b/ChangeLog
index 33d6d85d2..18e14ebb8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,9 @@
 	  Mattias Ellert <mattias.ellert@tsl.uu.se>).
 	* include/sane/config.h.in: Added test for IOKit.
 	* README.darwin: Updated concerning SCSI support.
+	* backend/Makefile.in: Disable manual links for shared libraries.
+	  This breaks MacOS X and doesn't seem to be necessary on other
+	  platforms any more.
 
 2003-04-27  Henning Meier-Geinitz <henning@meier-geinitz.de>
 
diff --git a/backend/Makefile.in b/backend/Makefile.in
index 2d9f2f2e8..4cbfaf3fd 100644
--- a/backend/Makefile.in
+++ b/backend/Makefile.in
@@ -180,23 +180,23 @@ install:
               $(DESTDIR)$(libsanedir)/$${be} || exit 1; \
 	done
 	@$(LIBTOOL) $(MINST) --finish $(DESTDIR)$(libsanedir)
-	@# Assume the dll name without any versions is last
-	@dllend=`../tools/libtool-get-dll-ext libsane-dll.la`; \
-	list="$(ALL_BACKENDS)"; cd $(DESTDIR)$(libsanedir) && for be in $$list; do \
-	  file=libsane-$${be}.$$dllend.$(V_MAJOR); \
-	  lib=`grep dlname= libsane-$${be}.la | cut -f2 -d"'"`; \
-	  if test ! -f $${file} -a -n "$${lib}"; then \
-	    $(LN_S) $${lib} $${file}; \
-	  fi; \
-	done
-	@# Assume the dll name without any versions is last
-	@dllend=`../tools/libtool-get-dll-ext libsane-dll.la`; \
-	rm -f $(DESTDIR)$(libdir)/libsane.a $(DESTDIR)$(libdir)/libsane.$$dllend \
-		$(DESTDIR)$(libdir)/libsane.$$dllend.$(V_MAJOR)*; \
-	cd $(DESTDIR)$(libsanedir) && for n in libsane-dll.$$dllend.$(V_MAJOR)*; do \
-	  nn=`echo $$n | sed 's,^libsane-dll,libsane,'`; \
-	  (cd ..; if test -f sane/$$n ; then $(LN_S) sane/$$n $$nn; fi; ); \
-	done || exit 1
+#	@# Assume the dll name without any versions is last
+#	@dllend=`../tools/libtool-get-dll-ext libsane-dll.la`; \
+#	list="$(ALL_BACKENDS)"; cd $(DESTDIR)$(libsanedir) && for be in $$list; do \
+#	  file=libsane-$${be}.$$dllend.$(V_MAJOR); \
+#	  lib=`grep dlname= libsane-$${be}.la | cut -f2 -d"'"`; \
+#	  if test ! -f $${file} -a -n "$${lib}"; then \
+#	    $(LN_S) $${lib} $${file}; \
+#	  fi; \
+#	done
+#	@# Assume the dll name without any versions is last
+#	@dllend=`../tools/libtool-get-dll-ext libsane-dll.la`; \
+#	rm -f $(DESTDIR)$(libdir)/libsane.a $(DESTDIR)$(libdir)/libsane.$$dllend \
+#		$(DESTDIR)$(libdir)/libsane.$$dllend.$(V_MAJOR)*; \
+#	cd $(DESTDIR)$(libsanedir) && for n in libsane-dll.$$dllend.$(V_MAJOR)*; do \
+#	  nn=`echo $$n | sed 's,^libsane-dll,libsane,'`; \
+#	  (cd ..; if test -f sane/$$n ; then $(LN_S) sane/$$n $$nn; fi; ); \
+#	done || exit 1
 	$(LIBTOOL) $(MINST) $(INSTALL_PROGRAM) libsane.la \
           $(DESTDIR)$(libdir)/libsane.la
 	@list="$(CONFIGS)"; for cfg in $$list; do \