diff --git a/debian/changelog b/debian/changelog
index a60196fa70..9bd17d80a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,22 @@
-gtk+2.0 (2.4.0) experimental; urgency=low
+gtk+2.0 (2.4.0-1) UNRELEASED; urgency=low
   * debian/control
-    - upgraded to 2.4.0
+    - updated for 2.4.0
+  * debian/sources
+    - updated for 2.4.0
+  * debian/control.in
+    - updated for 2.4.0
+  * debian/scripts/vars
+    - updated for 2.4.0
+  * debian/patches/:
+    - removed 002_gtk+-debian-freetype.patch - not needed any more, configure already has the changes
+    - removed 000_gtk+-2.2.4-non-weak-symbols.patch - fixed in upstream source
+    - removed 000_gtk+-2.2.4-socketfocus.patch - fixed in upstream source
+    - 001_gtk+-debian-aclocal-pass_all.patch - updated
+    - removed 001_gtk+-ximian-gtk2-filesel-navbutton-5.patch - completely irrelevent due to fileselector changes
+    - 000_gtk+-2.2.0-buildfix-immodule.patch - updated
+    - 000_gtk+-debian-xinerama-pic.patch - updated
+  * debian/watch
+    - updated for 2.4.0
 
  -- Rob Taylor <robtaylor@fastmail.fm>  Thu, 18 Mar 2004 19:19:07 -0300
 
diff --git a/debian/control b/debian/control
index 3dea7d51c4..fec7bc8e33 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: libs
 Priority: optional
 Maintainer: Akira TAGOH <tagoh@debian.org>
 Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Andrew Lau <netsnipe@users.sourceforge.net>, Edd Dumbill <ejad@debian.org>, Emil Soleyman-Zomalan <emil@nishra.com>, Gustavo Noronha Silva <kov@debian.org>, J.H.M. Dassen (Ray) <jdassen@debian.org>, Johannes Rohr <j.rohr@comlink.org>, Jordi Mallach <jordi@debian.org>, Jose Carlos Garcia Sogo <jsogo@debian.org>, Josselin Mouette <joss@debian.org>, Ondřej Surý <ondrej@debian.org>, Rob Bradford <rob@debianplanet.org>, Robert McQueen <robot101@debian.org>, Ross Burton <ross@burtonini.com>, Sebastien Bacher <seb128@debian.org>, Takuo KITAME <kitame@debian.org>
-Build-Depends: debhelper (>> 4.0.0), gettext, pkg-config, libglib2.0-dev (>= 2.4.0), libpango1.0-dev (>= 1.2.0-3), libatk1.0-dev (>= 1.2.0), xlibs-pic (>= 4.2.1-6), xlibs-dev, libtiff3g-dev, libjpeg62-dev, libpng12-dev, docbook-utils, linuxdoc-tools-text, gnome-pkg-tools
+Build-Depends: debhelper (>> 4.0.0), gettext, pkg-config, libglib2.0-dev (>= 2.4.0-1), libpango1.0-dev (>= 1.2.0-3), libatk1.0-dev (>= 1.2.0), xlibs-pic (>= 4.2.1-6), xlibs-dev, libtiff3g-dev, libjpeg62-dev, libpng12-dev, docbook-utils, linuxdoc-tools-text, gnome-pkg-tools
 Build-Depends-Indep: gtk-doc-tools, docbook-xml
 Standards-Version: 3.6.1.0
 
@@ -38,7 +38,7 @@ Description: Common files for the GTK+ graphical user interface library
 Package: libgtk2.0-dev
 Section: libdevel
 Architecture: any
-Depends: libgtk2.0-0 (= ${Source-Version}), libglib2.0-dev (>= 2.4.0), libpango1.0-dev (>= 1.2.0-3), libatk1.0-dev (>= 1.2.0), xlibs-dev, pkg-config
+Depends: libgtk2.0-0 (= ${Source-Version}), libglib2.0-dev (>= 2.4.0-1), libpango1.0-dev (>= 1.2.0-3), libatk1.0-dev (>= 1.2.0), xlibs-dev, pkg-config
 Suggests: libgtk2.0-doc
 Replaces: libgtk1.3-dev
 Conflicts: libgtk1.3-dev
diff --git a/debian/control.in b/debian/control.in
index cf77c4ee1f..4e898dec21 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -3,7 +3,7 @@ Section: libs
 Priority: optional
 Maintainer: Akira TAGOH <tagoh@debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>> 4.0.0), gettext, pkg-config, libglib2.0-dev (>= 2.4.0), libpango1.0-dev (>= 1.2.0-3), libatk1.0-dev (>= 1.2.0), xlibs-pic (>= 4.2.1-6), xlibs-dev, libtiff3g-dev, libjpeg62-dev, libpng12-dev, docbook-utils, linuxdoc-tools-text, gnome-pkg-tools
+Build-Depends: debhelper (>> 4.0.0), gettext, pkg-config, libglib2.0-dev (>= 2.4.0-1), libpango1.0-dev (>= 1.2.0-3), libatk1.0-dev (>= 1.2.0), xlibs-pic (>= 4.2.1-6), xlibs-dev, libtiff3g-dev, libjpeg62-dev, libpng12-dev, docbook-utils, linuxdoc-tools-text, gnome-pkg-tools
 Build-Depends-Indep: gtk-doc-tools, docbook-xml
 Standards-Version: 3.6.1.0
 
@@ -38,7 +38,7 @@ Description: Common files for the GTK+ graphical user interface library
 Package: libgtk2.0-dev
 Section: libdevel
 Architecture: any
-Depends: libgtk2.0-@SONAME@ (= ${Source-Version}), libglib2.0-dev (>= 2.4.0), libpango1.0-dev (>= 1.2.0-3), libatk1.0-dev (>= 1.2.0), xlibs-dev, pkg-config
+Depends: libgtk2.0-@SONAME@ (= ${Source-Version}), libglib2.0-dev (>= 2.4.0-1), libpango1.0-dev (>= 1.2.0-3), libatk1.0-dev (>= 1.2.0), xlibs-dev, pkg-config
 Suggests: libgtk2.0-doc
 Replaces: libgtk1.3-dev
 Conflicts: libgtk1.3-dev