diff --git a/srcpkgs/gir-gtk+ b/srcpkgs/gir-gtk+
new file mode 120000
index 00000000000..50dbbf5fe75
--- /dev/null
+++ b/srcpkgs/gir-gtk+
@@ -0,0 +1 @@
+gtk+
\ No newline at end of file
diff --git a/srcpkgs/gtk+/gir-gtk+.template b/srcpkgs/gtk+/gir-gtk+.template
new file mode 100644
index 00000000000..9fcbe58eff8
--- /dev/null
+++ b/srcpkgs/gtk+/gir-gtk+.template
@@ -0,0 +1,12 @@
+# Template file for 'gir-gtk+'.
+#
+short_desc="Introspection data for GTK+"
+long_desc="${long_desc}
+
+ This package contains small pieces of introspection data for the GTK+ library."
+
+do_install()
+{
+	install -d ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
+}
diff --git a/srcpkgs/gtk+/gtk+-devel.template b/srcpkgs/gtk+/gtk+-devel.template
index 5afe284171f..26c0e211afe 100644
--- a/srcpkgs/gtk+/gtk+-devel.template
+++ b/srcpkgs/gtk+/gtk+-devel.template
@@ -5,6 +5,8 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=1
+
 Add_dependency run pkg-config
 Add_dependency run libXext-devel
 Add_dependency run libXrender-devel
@@ -49,7 +51,7 @@ do_install()
 	done
 	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/share/gtk-doc ${DESTDIR}/usr/share
+	mv ${SRCPKGDESTDIR}/usr/share/{gir-*,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/srcpkgs/gtk+/template b/srcpkgs/gtk+/template
index 7098838548a..b7f3bb16575 100644
--- a/srcpkgs/gtk+/template
+++ b/srcpkgs/gtk+/template
@@ -3,7 +3,7 @@ pkgname=gtk+
 version=2.22.0
 distfiles="${GNOME_SITE}/gtk+/2.22/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
-configure_args="--disable-cups --with-xinput --enable-introspection=no"
+configure_args="--disable-cups --with-xinput"
 short_desc="The GTK+ toolkit (v2)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=d9522c80d4b8a954f7474e32bd5a99ba3051996f1c4681426db5f79a1c1b4602
@@ -20,7 +20,7 @@ long_desc="
 
 conf_files="/etc/gtk-2.0/im-multipress.conf"
 triggers="gtk-immodules"
-subpackages="$pkgname-devel"
+subpackages="gir-$pkgname $pkgname-devel"
 
 Add_dependency run glibc
 Add_dependency run libXext
@@ -50,17 +50,18 @@ Add_dependency build libXinerama-devel
 Add_dependency build libXi-devel
 Add_dependency build libXrandr-devel
 Add_dependency build libXcursor-devel
-Add_dependency build pango-devel
+Add_dependency build pango-devel		">=1.28.0"
 Add_dependency build libX11-devel
 Add_dependency build libXcomposite-devel
 Add_dependency build libXdamage-devel
 Add_dependency build libXfixes-devel
-Add_dependency build atk-devel
+Add_dependency build atk-devel			">=1.32.0"
 Add_dependency build cairo-devel
 Add_dependency build gdk-pixbuf-devel
 Add_dependency build libpng-devel
 Add_dependency build glib-devel
 Add_dependency build freetype-devel
 Add_dependency build fontconfig-devel
+Add_dependency build gobject-introspection
 
 Add_dependency full shared-mime-info