diff --git a/srcpkgs/webkitgtk/template b/srcpkgs/webkitgtk/template
index b22e2df86f0..b9da2169d38 100644
--- a/srcpkgs/webkitgtk/template
+++ b/srcpkgs/webkitgtk/template
@@ -1,23 +1,39 @@
 # Template file for 'webkitgtk'
 pkgname=webkitgtk
-version=2.2.3
+version=2.2.4
 revision=1
 build_style=gnu-configure
-configure_args="--with-gtk=3.0 --enable-introspection"
+configure_args="--with-gtk=3.0"
 short_desc="GTK+3 port of the WebKit browser engine"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://webkitgtk.org/"
 license="LGPL-2.1, Simplified BSD (2 clause)"
 distfiles="${homepage}/releases/${pkgname}-${version}.tar.xz"
-checksum=94bcb3303aadce8454b572ab0e5d178eca3b7238f34bd3e7177b0daec04e4605
+checksum=5e1aee1bfca3602cb02920d6984c584c775c661b30c33955e35ff9a21b4c4d74
 
-hostmakedepends="perl pkg-config intltool which gperf flex ruby gobject-introspection"
+hostmakedepends="perl pkg-config intltool which gperf flex ruby"
 makedepends="
  libjpeg-turbo-devel libpng-devel>=1.6 sqlite-devel harfbuzz-devel>=0.9.19
  gst-plugins-base1-devel libsoup-devel>=2.42 libxslt-devel icu-devel>=49
  enchant-devel dbus-glib-devel geoclue-devel libwebp-devel libsecret-devel
  gtk+-devel gtk+3-devel>=3.8 libgudev-devel libXt-devel"
 
+# Package build options
+build_options="gir"
+desc_option_gir="Enable support for building gobject introspection data"
+
+# Disable gir for cross builds.
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default="gir"
+fi
+
+if [ "$build_option_gir" ]; then
+	configure_args+=" --enable-introspection"
+	hostmakedepends+=" gobject-introspection"
+else
+	configure_args+=" --disable-introspection"
+fi
+
 webkitgtk-devel_package() {
 	replaces="webkit-gtk3-devel>=0"
 	provides="webkit-gtk3-devel-${version}"
@@ -26,7 +42,9 @@ webkitgtk-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove usr/share/gir-1.0
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+		fi
 		vmove usr/share/gtk-doc
 		vmove "usr/lib/*.so"
 	}