diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 0162eb592e..5ae9e598fa 100644
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,10 @@
+1999-11-22  Havoc Pennington  <hp@pobox.com>
+
+	* src/Makefile.am (GDK_PIXBUF_LIBS): Patch from Paul Fisher
+	<pnfisher@redhat.com> adds all -lgdk-pixbuf and all other
+	dependencies to LIBADD variables for loadable modules. Necessary
+	for a Java dynamic loading thing to be able to figure it out.
+
 1999-11-22  Havoc Pennington  <hp@pobox.com>
 
 	* src/io-png.c (image_load_increment): Call the update_area
diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
index c7fe0a02e2..8b44d8f8a7 100644
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -49,6 +49,7 @@ testpixbuf_LDADD = $(LDADDS) $(LIBART_LIBS) \
 
 testpixbuf_drawable_LDADD = $(LDADDS)
 
+GDK_PIXBUF_LIBS = -lgdk_pixbuf $(LIBART_LIBS) $(GLIB_LIBS) $(GTK_LIBS)
 
 #
 # The GdkPixBuf library
@@ -80,52 +81,53 @@ noinst_HEADERS = \
 #
 libpixbuf_png_la_SOURCES = io-png.c
 libpixbuf_png_la_LDFLAGS = -avoid-version -module
-libpixbuf_png_la_LIBADD = $(LIBPNG)
+libpixbuf_png_la_LIBADD = $(LIBPNG) $(GDK_PIXBUF_LIBS)
 
 #
 # The JPEG loader
 #
 libpixbuf_jpeg_la_SOURCES = io-jpeg.c
 libpixbuf_jpeg_la_LDFLAGS = -avoid-version -module
-libpixbuf_jpeg_la_LIBADD = $(LIBJPEG)
+libpixbuf_jpeg_la_LIBADD = $(LIBJPEG) $(GDK_PIXBUF_LIBS)
 
 #
 # The XPM loader
 #
 libpixbuf_xpm_la_SOURCES = io-xpm.c
 libpixbuf_xpm_la_LDFLAGS = -avoid-version -module
+libpixbuf_xpm_la_LIBADD = $(GDK_PIXBUF_LIBS)
 
 #
 # The GIF loader
 #
 libpixbuf_gif_la_SOURCES = io-gif.c
 libpixbuf_gif_la_LDFLAGS = -avoid-version -module
-libpixbuf_gif_la_LIBADD =
+libpixbuf_gif_la_LIBADD = $(GDK_PIXBUF_LIBS)
 
 #
 # The RAS loader
 #
 libpixbuf_ras_la_SOURCES = io-ras.c
 libpixbuf_ras_la_LDFLAGS = -avoid-version -module
-libpixbuf_ras_la_LIBADD =
+libpixbuf_ras_la_LIBADD = $(GDK_PIXBUF_LIBS)
 
 #
 # The TIFF loader
 #
 libpixbuf_tiff_la_SOURCES = io-tiff.c
 libpixbuf_tiff_la_LDFLAGS = -avoid-version -module
-libpixbuf_tiff_la_LIBADD = $(LIBTIFF)
+libpixbuf_tiff_la_LIBADD = $(LIBTIFF) $(GDK_PIXBUF_LIBS)
 
 #
 # The PNM loader
 #
 libpixbuf_pnm_la_SOURCES = io-pnm.c
 libpixbuf_pnm_la_LDFLAGS = -avoid-version -module
-libpixbuf_pnm_la_LIBADD = 
+libpixbuf_pnm_la_LIBADD = $(GDK_PIXBUF_LIBS)
 
 #
 # The BMP loader
 #
 libpixbuf_bmp_la_SOURCES = io-bmp.c
 libpixbuf_bmp_la_LDFLAGS = -avoid-version -module
-libpixbuf_bmp_la_LIBADD =
+libpixbuf_bmp_la_LIBADD = $(GDK_PIXBUF_LIBS)