diff --git a/ChangeLog b/ChangeLog
index 48300a2a75..ddff5e8884 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-01-17  Tor Lillqvist  <tml@novell.com>
+
+	* gtk-zip.sh.in: Include also the COPYING file.
+
 2007-01-17  Matthias Clasen  <mclasen@redhat.com>
 
 	* modules/printbackends/cups/gtkprintbackendcups.c: Don't use
diff --git a/gtk-zip.sh.in b/gtk-zip.sh.in
index 7c90c70952..c84575d83c 100755
--- a/gtk-zip.sh.in
+++ b/gtk-zip.sh.in
@@ -5,8 +5,14 @@
 ZIP=/tmp/gtk+-@GTK_VERSION@.zip
 DEVZIP=/tmp/gtk+-dev-@GTK_VERSION@.zip
 cd @prefix@
-rm $ZIP
 
+mkdir -p share/doc/gtk+-@GTK_VERSION@
+cp -p @abs_srcdir@/COPYING share/doc/gtk+-@GTK_VERSION@
+
+mkdir -p share/doc/gtk+-dev-@GTK_VERSION@
+cp -p @abs_srcdir@/COPYING share/doc/gtk+-dev-@GTK_VERSION@
+
+rm $ZIP
 zip $ZIP -@ <<EOF
 COPYING.LIB-2
 etc/gtk-2.0/gdk-pixbuf.loaders
@@ -29,6 +35,8 @@ zip $ZIP share/themes/MS-Windows/gtk-2.0/gtkrc
 zip $ZIP lib/locale/*/LC_MESSAGES/gtk20.mo
 zip $ZIP lib/locale/*/LC_MESSAGES/gtk20-properties.mo
 
+zip $ZIP share/doc/gtk+-@GTK_VERSION@
+
 rm $DEVZIP
 zip -r $DEVZIP -@ <<EOF
 include/gtk-2.0
@@ -54,3 +62,4 @@ share/gtk-doc/html/gdk
 share/gtk-doc/html/gtk
 EOF
 
+zip $DEVZIP share/doc/gtk+-dev-@GTK_VERSION@