diff --git a/srcpkgs/gtk+/files/gtkrc b/srcpkgs/gtk+/files/gtkrc
index 36fb549f16b..9fb64ac75d1 100644
--- a/srcpkgs/gtk+/files/gtkrc
+++ b/srcpkgs/gtk+/files/gtkrc
@@ -1,3 +1,3 @@
-gtk-theme-name = "Adwaita"
+gtk-theme-name = "gnome"
 gtk-icon-theme-name = "Adwaita"
 gtk-cursor-theme-name = "Adwaita"
diff --git a/srcpkgs/gtk+/template b/srcpkgs/gtk+/template
index a3c3325ee6f..b076dcc654c 100644
--- a/srcpkgs/gtk+/template
+++ b/srcpkgs/gtk+/template
@@ -1,9 +1,9 @@
 # Template build file for 'gtk+'.
 pkgname=gtk+
 version=2.24.25
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-cups --with-xinput"
+configure_args="--enable-cups --with-xinput $(vopt_enable gir introspection)"
 short_desc="The GTK+ toolkit (v2)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gtk.org"
@@ -11,14 +11,14 @@ license="LGPL-2.1"
 distfiles="${GNOME_SITE}/gtk+/2.24/gtk+-$version.tar.xz"
 checksum=38af1020cb8ff3d10dda2c8807f11e92af9d2fa4045de61c62eedb7fbc7ea5b3
 
-hostmakedepends="pkg-config perl"
+hostmakedepends="pkg-config perl $(vopt_if gir gobject-introspection)"
 makedepends="shared-mime-info glib-devel libXcursor-devel
  libXext-devel libXrender-devel libXinerama-devel libXi-devel libXrandr-devel
  libXcomposite-devel libXdamage-devel fontconfig-devel
  gdk-pixbuf-devel>=2.26.1_2 cairo-devel pango-devel>=1.28.0
  atk-devel>=1.32.0 cups-devel>=1.6.1_9 dbus-x11"
 depends="shared-mime-info dbus-x11 gdk-pixbuf>=2.26.1_2
- gtk-update-icon-cache>=${version}_${revision} adwaita-icon-theme"
+ gtk-update-icon-cache>=${version}_${revision} gnome-icon-theme adwaita-icon-theme"
 conf_files="/etc/gtk-2.0/im-multipress.conf"
 triggers="gtk-immodules"
 
@@ -44,13 +44,6 @@ if [ -z "$CROSS_BUILD" ]; then
 	build_options_default="gir"
 fi
 
-if [ "$build_option_gir" ]; then
-	configure_args+=" --enable-introspection"
-	makedepends+=" gobject-introspection"
-else
-	configure_args+=" --disable-introspection"
-fi
-
 gtk+-devel_package() {
 	depends="libglib-devel atk-devel cairo-devel gdk-pixbuf-devel pango-devel gtk+>=${version}_${revision}"
 	short_desc+=" - development files"
@@ -66,7 +59,6 @@ gtk+-devel_package() {
 		vmove usr/share/aclocal
 	}
 }
-
 gtk+-demo_package() {
 	short_desc+=" - demonstration application"
 	pkg_install() {
@@ -74,7 +66,6 @@ gtk+-demo_package() {
 		vmove usr/share/gtk-2.0/demo
 	}
 }
-
 gtk-update-icon-cache_package() {
 	short_desc+=" - The GTK+ update icon cache tool"
 	replaces="gtk+<=2.24.8_3 gtk+3<=3.2.2"