diff --git a/templates/gtk+-devel b/templates/gtk+-devel
new file mode 120000
index 00000000000..50dbbf5fe75
--- /dev/null
+++ b/templates/gtk+-devel
@@ -0,0 +1 @@
+gtk+
\ No newline at end of file
diff --git a/templates/gtk+/depends b/templates/gtk+/depends
new file mode 100644
index 00000000000..551cadd4d95
--- /dev/null
+++ b/templates/gtk+/depends
@@ -0,0 +1,2 @@
+abi_depends=2.16.0
+api_depends=${abi_depends}
diff --git a/templates/gtk+/devel.template b/templates/gtk+/devel.template
new file mode 100644
index 00000000000..767648789f0
--- /dev/null
+++ b/templates/gtk+/devel.template
@@ -0,0 +1,42 @@
+# Template file for 'gtk+-devel'.
+#
+short_desc="${sourcepkg} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run gtk+
+Add_dependency run python
+
+do_install()
+{
+	local lver="2.10.0"
+	local libdirs="immodules printbackends engines loaders"
+
+	for dir in ${libdirs}; do
+		mkdir -p ${DESTDIR}/usr/lib/gtk-2.0/${lver}/${dir}
+	done
+	mkdir -p ${DESTDIR}/usr/bin
+	mkdir -p ${DESTDIR}/usr/share/man/man1
+	mkdir -p ${DESTDIR}/usr/lib/gtk-2.0/modules
+
+	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	for bin in gdk-pixbuf-csource gtk-builder-convert; do
+		mv ${SRCPKGDESTDIR}/usr/bin/${bin} ${DESTDIR}/usr/bin
+		mv ${SRCPKGDESTDIR}/usr/share/man/man1/${bin}.1 \
+			${DESTDIR}/usr/share/man/man1
+	done
+	mv ${SRCPKGDESTDIR}/usr/lib/lib*.*a ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/lib*.so ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/gtk-2.0/include ${DESTDIR}/usr/lib/gtk-2.0
+	mv ${SRCPKGDESTDIR}/usr/lib/gtk-2.0/modules/*.la \
+		${DESTDIR}/usr/lib/gtk-2.0/modules
+	for dir in immodules printbackends engines loaders; do
+		mv ${SRCPKGDESTDIR}/usr/lib/gtk-2.0/${lver}/${dir}/*.la \
+			${DESTDIR}/usr/lib/gtk-2.0/${lver}/${dir}
+	done
+	mv ${SRCPKGDESTDIR}/usr/share/gtk-doc ${DESTDIR}/usr/share
+	mv ${SRCPKGDESTDIR}/usr/share/aclocal ${DESTDIR}/usr/share
+	mv ${SRCPKGDESTDIR}/usr/share/gtk-2.0 ${DESTDIR}/usr/share
+}
diff --git a/templates/gtk+/gtk+-tests-Makefile-in.diff b/templates/gtk+/gtk+-tests-Makefile-in.diff
deleted file mode 100644
index b321215cea9..00000000000
--- a/templates/gtk+/gtk+-tests-Makefile-in.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Missing --tag while building C++ tests.
-
---- tests/Makefile.in.orig	2008-09-24 05:11:43.000000000 +0200
-+++ tests/Makefile.in	2008-10-03 01:36:19.000000000 +0200
-@@ -1293,11 +1293,11 @@ LINK = $(LIBTOOL) --mode=link $(CCLD) $(
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- CXXLD = $(CXX)
--CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- DIST_SOURCES = $(am__autotestkeywords_SOURCES_DIST) pixbuf-lowmem.c \
- 	pixbuf-random.c pixbuf-randomly-modified.c pixbuf-read.c \
diff --git a/templates/gtk+/template b/templates/gtk+/template
index 5ad5fd69933..a2770736af1 100644
--- a/templates/gtk+/template
+++ b/templates/gtk+/template
@@ -1,17 +1,13 @@
 # Template build file for 'gtk+'.
 pkgname=gtk+
-version=2.14.3
-patch_files="$pkgname-tests-Makefile-in.diff"
-distfiles="
-http://ftp.gnome.org/pub/GNOME/sources/gtk+/2.14/$pkgname-$version.tar.bz2"
+sourcepkg=$pkgname
+version=2.16.1
+distfiles="${GNOME_SITE}/gtk+/2.16/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
-configure_args="--disable-cups"
-make_cmd="$XBPS_MASTERDIR/bin/gmake"
-pkgconfig_override="gail.pc gdk-2.0.pc gdk-pixbuf-2.0.pc gdk-pixbuf-xlib-2.0.pc
-gdk-x11-2.0.pc gtk+-2.0.pc gtk+-unix-print-2.0.pc gtk+-x11-2.0.pc"
-short_desc="GIMP Toolkit v2 - libraries for building X11 user interfaces"
+configure_args="--disable-cups --with-xinput"
+short_desc="The GTK+ toolkit (v2)"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=bc7a608ec30b013bf360c3a6a6c0e15adf337272
+checksum=2f1f3fbdb2f5f907913838d6efbb595419e370c950838bb7fad51eb0ed776d50
 long_desc="
  GTK+ is a multi-platform toolkit for creating graphical user
  interfaces. Offering a complete set of widgets, GTK+ is suitable for
@@ -23,5 +19,33 @@ long_desc="
  Python (especially in combination with the Glade GUI builder) provides
  an effective method of rapid application development."
 
-# Update db modules files once installed.
-postinstall_helpers="gtk-update-immodules.sh gtk-update-gdkpixbufloaders.sh"
+conf_files="/etc/gtk-2.0/im-multipress.conf"
+triggers="gtk-pixbuf-loaders gtk-immodules"
+
+subpackages="devel"
+Add_dependency build pkg-config
+Add_dependency build perl
+Add_dependency full glibc
+Add_dependency full expat
+Add_dependency full glib
+Add_dependency full atk
+Add_dependency full pango
+Add_dependency full fontconfig
+Add_dependency full freetype
+Add_dependency full jpeg
+Add_dependency full libpng
+Add_dependency full tiff
+Add_dependency full jasper
+Add_dependency full shared-mime-info
+Add_dependency full pixman
+Add_dependency full libX11
+Add_dependency full libXcursor
+Add_dependency full libXft
+Add_dependency full libXfixes
+Add_dependency full libXinerama
+Add_dependency full libXi
+Add_dependency full libXrandr
+Add_dependency full libXrender
+Add_dependency full libXt
+Add_dependency full libXext
+Add_dependency full libXcomposite