diff --git a/ChangeLog b/ChangeLog
index 0f8ee5900..74a43331b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-17  Tor Lillqvist  <tml@novell.com>
+
+	* glib-zip.in: DLLs are always installed in "bin" with current
+	libtool, drop unnecessary logic to check where they are. Include
+	also the COPYING file.
+
 2007-01-17  Tor Lillqvist  <tml@novell.com>
 
 	* glib/galloca.h: Use <malloc.h> also with Digital Mars compiler
diff --git a/glib-zip.in b/glib-zip.in
index 2c9811e75..9ca1e0b5d 100755
--- a/glib-zip.in
+++ b/glib-zip.in
@@ -7,23 +7,28 @@ ZIP=/tmp/glib-@GLIB_VERSION@.zip
 DEVZIP=/tmp/glib-dev-@GLIB_VERSION@.zip
 
 cd @prefix@
+
+mkdir -p share/doc/glib-@GLIB_VERSION@
+cp -p @abs_srcdir@/COPYING share/doc/glib-@GLIB_VERSION@
+
+mkdir -p share/doc/glib-dev-@GLIB_VERSION@
+cp -p @abs_srcdir@/COPYING share/doc/glib-dev-@GLIB_VERSION@
+
 rm $ZIP
-
-DLLDIR=lib
-[ -f bin/libglib-2.0-@LT_CURRENT_MINUS_AGE@.dll ] && DLLDIR=bin
-
 zip $ZIP -@ <<EOF
 COPYING.LIB-2
 bin/gspawn-win32-helper.exe
 bin/gspawn-win32-helper-console.exe
-$DLLDIR/libglib-2.0-@LT_CURRENT_MINUS_AGE@.dll
-$DLLDIR/libgmodule-2.0-@LT_CURRENT_MINUS_AGE@.dll
-$DLLDIR/libgobject-2.0-@LT_CURRENT_MINUS_AGE@.dll
-$DLLDIR/libgthread-2.0-@LT_CURRENT_MINUS_AGE@.dll
+bin/libglib-2.0-@LT_CURRENT_MINUS_AGE@.dll
+bin/libgmodule-2.0-@LT_CURRENT_MINUS_AGE@.dll
+bin/libgobject-2.0-@LT_CURRENT_MINUS_AGE@.dll
+bin/libgthread-2.0-@LT_CURRENT_MINUS_AGE@.dll
 EOF
 
 zip -r $ZIP lib/locale/*/LC_MESSAGES/glib20.mo
 
+zip -r $ZIP share/doc/glib-@GLIB_VERSION@
+
 rm $DEVZIP
 zip -r $DEVZIP -@ <<EOF
 bin/glib-genmarshal.exe
@@ -57,3 +62,5 @@ share/gtk-doc/html/gobject
 man/man1/glib-mkenums.1
 man/man1/glib-genmarshal.1
 EOF
+
+zip -r $DEVZIP share/doc/glib-dev-@GLIB_VERSION@