diff --git a/ChangeLog b/ChangeLog
index 66e1ef5979..a484ee391e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-04-15  Tor Lillqvist  <tml@iki.fi>
+
+	* libgimpthumb/Makefile.am: For Win32, install gimpthumb.def, like
+	the .def files of the other libgimp* libs.
+
+	* app/Makefile.am (INCLUDES): Add PANGOFT2_CFLAGS.
+
+	* gimp-zip.in: Put also libgimpthumb in the developer package.
+
 2004-04-15  Sven Neumann  <sven@gimp.org>
 
 	* plug-ins/winicon/icodialog.c: fixed gtk+ includes, added a
diff --git a/app/Makefile.am b/app/Makefile.am
index 98c8820d20..016a629821 100644
--- a/app/Makefile.am
+++ b/app/Makefile.am
@@ -71,6 +71,7 @@ AM_CPPFLAGS = \
 INCLUDES = \
 	-I$(top_srcdir)	\
 	$(GTK_CFLAGS)	\
+	$(PANGOFT2_CFLAGS) \
 	-I$(includedir)
 
 gimp_2_0_LDFLAGS = \
diff --git a/gimp-zip.in b/gimp-zip.in
index 9f3d6b13f8..4de323261d 100755
--- a/gimp-zip.in
+++ b/gimp-zip.in
@@ -18,6 +18,7 @@ bin/libgimpbase-@GIMP_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
 bin/libgimpcolor-@GIMP_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
 bin/libgimpmath-@GIMP_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
 bin/libgimpmodule-@GIMP_API@-@LT_CURRENT_MINUS_AGE@.dll
+bin/libgimpthumb-@GIMP_API@-@LT_CURRENT_MINUS_AGE@.dll
 bin/libgimpui-@GIMP_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
 bin/libgimpwidgets-@GIMP_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
 lib/gimp/@GIMP_PLUGIN_VERSION@/environ
@@ -48,6 +49,8 @@ lib/gimpmath.def
 lib/libgimpmodule-@GIMP_API_VERSION@.dll.a
 lib/gimpmodule-@GIMP_API_VERSION@.lib
 lib/gimpmodule.def
+lib/gimpthumb-@GIMP_API_VERSION@.lib
+lib/gimpthumb.def
 lib/libgimpui-@GIMP_API_VERSION@.dll.a
 lib/gimpui-@GIMP_API_VERSION@.lib
 lib/gimpui.def
diff --git a/libgimpthumb/Makefile.am b/libgimpthumb/Makefile.am
index 12ae9082a8..435701f795 100644
--- a/libgimpthumb/Makefile.am
+++ b/libgimpthumb/Makefile.am
@@ -12,9 +12,11 @@ libgimpthumb_export_symbols = -export-symbols gimpthumb.def
 
 install-libtool-import-lib:
 	$(INSTALL) .libs/libgimpthumb-$(GIMP_API_VERSION).dll.a $(DESTDIR)$(libdir)
+	$(INSTALL) gimpthumb.def $(DESTDIR)$(libdir)
 
 uninstall-libtool-import-lib:
 	-rm $(DESTDIR)$(libdir)/libgimpthumb-$(GIMP_API_VERSION).dll.a
+	-rm $(DESTDIR)$(libdir)/gimpthumb.def
 else
 install-libtool-import-lib:
 uninstall-libtool-import-lib: