diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index 7171078f8..f7788f474 100644
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -1,3 +1,11 @@
+2004-09-22  Tor Lillqvist  <tml@iki.fi>
+
+	* Makefile.am (install-libtool-import-lib): [Win32] Add code to
+	remove the bug-compatibility entries (see #134813, and related
+	comments below) from the import library. The PRIVATE keyword in
+	the .def file is supposed to mean that, but it isn't implemented
+	yet by GNU ld.
+
 2004-08-13  Matthias Clasen  <clasen@redhat.com>
 
 	* === Released 2.4.6 ===
diff --git a/gobject/Makefile.am b/gobject/Makefile.am
index dfb49dc72..6287ff91b 100644
--- a/gobject/Makefile.am
+++ b/gobject/Makefile.am
@@ -39,6 +39,14 @@ if OS_WIN32
 export_symbols = -export-symbols $(srcdir)/gobject.def
 
 install-libtool-import-lib:
+# 	Don't put the bug compatibility entries in the import lib!
+#	(Unfortunately the GNU linker doesn't yet understand the PRIVATE
+#	directive in .def files.)
+#
+	for entry in `grep PRIVATE gobject.def | sed -e 's/PRIVATE//'`; do \
+	  file=`nm -A .libs/libgobject-2.0.dll.a | grep -m 1 $$entry | cut -d: -f2`; \
+	  ar d .libs/libgobject-2.0.dll.a $$file; \
+	done
 	$(INSTALL) .libs/libgobject-2.0.dll.a $(DESTDIR)$(libdir)
 	$(INSTALL) $(srcdir)/gobject.def $(DESTDIR)$(libdir)/gobject-2.0.def