diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 38df1078289..58bded1cfe2 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -29,6 +29,11 @@ build_options="gir wayland x11"
 build_options_default="wayland x11"
 if [ -z "$CROSS_BUILD" ]; then
 	build_options_default+=" gir"
+else
+	# Make cmake detect Ruby headers in cross base
+	configure_args+=" -DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/ruby-2.2.0"
+	# Fix non-working target CPU detection
+	configure_args+=" -DCMAKE_SYSTEM_PROCESSOR=${XBPS_TARGET_MACHINE%-musl}"
 fi
 
 if [ "$build_option_gir" ]; then
@@ -36,6 +41,7 @@ if [ "$build_option_gir" ]; then
 	hostmakedepends+=" gobject-introspection"
 else
 	configure_args+=" --disable-introspection"
+	configure_args+=" -DENABLE_INTROSPECTION=0"
 fi
 
 if [ "$build_option_wayland" ]; then