diff --git a/srcpkgs/gtk+3/template b/srcpkgs/gtk+3/template
index 383e70d0d20..225f7bc47d3 100644
--- a/srcpkgs/gtk+3/template
+++ b/srcpkgs/gtk+3/template
@@ -1,25 +1,31 @@
 # Template build file for 'gtk+3'.
 pkgname=gtk+3
-version=3.14.5
+version=3.14.6
 revision=1
 wrksrc="gtk+-${version}"
 build_style=gnu-configure
-configure_args="--disable-schemas-compile --enable-gtk2-dependency"
+configure_args="--disable-schemas-compile --enable-gtk2-dependency
+ $(vopt_enable broadway broadway-backend) $(vopt_enable colord)
+ $(vopt_enable cups) $(vopt_enable gir introspection)
+ $(vopt_enable wayland wayland-backend) $(vopt_enable x11 x11-backend)"
 short_desc="The GTK+ toolkit (v3)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gtk.org/"
 update_pkgname="gtk+"
 license="LGPL-2.1"
 distfiles="${GNOME_SITE}/gtk+/${version%.*}/gtk+-${version}.tar.xz"
-checksum=ba70f5ccde6646c6d8aa5a6398794b7bcf23fc45af22580a215d258f392dbbe2
+checksum=cfc424e6e10ffeb34a33762aeb77905c3ed938f0b4006ddb7e880aad234ef119
 
 hostmakedepends="automake gettext-devel libtool pkg-config
- glib-devel>=2.42 gtk-doc gobject-introspection gtk-update-icon-cache"
+ glib-devel>=2.42 gtk-doc gobject-introspection gtk-update-icon-cache
+ $(vopt_if wayland wayland-devel)"
 makedepends="libglib-devel>=2.42 atk-devel>=2.14 at-spi2-atk-devel>=2.14
- libpng-devel fontconfig-devel cairo-devel pango-devel>=1.36
- gdk-pixbuf-devel>=2.30"
+ libpng-devel fontconfig-devel cairo-devel pango-devel>=1.36 gdk-pixbuf-devel>=2.30
+ $(vopt_if colord 'colord-devel>=1.1.7')
+ $(vopt_if cups cups-devel) $(vopt_if wayland 'libxkbcommon-devel wayland-devel')
+ $(vopt_if x11 'libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel')"
 depends="gtk-update-icon-cache shared-mime-info glib>=2.42 atk>=2.14
- adwaita-icon-theme"
+ adwaita-icon-theme $(vopt_if x11 dbus-x11)"
 triggers="gtk3-immodules"
 conf_files="/etc/gtk-3.0/im-multipress.conf"
 
@@ -35,53 +41,8 @@ if [ -z "$CROSS_BUILD" ]; then
 	build_options_default+=" gir"
 fi
 
-if [ "$build_option_broadway" ]; then
-	configure_args+=" --enable-broadway-backend"
-else
-	configure_args+=" --disable-broadway-backend"
-fi
-
-if [ "$build_option_colord" ]; then
-	configure_args+=" --enable-colord"
-	makedepends+=" colord-devel>=1.1.7"
-else
-	configure_args+=" --disable-colord"
-fi
-
-if [ "$build_option_cups" ]; then
-	configure_args+=" --enable-cups"
-	hostmakedepends+=" cups-devel"
-	makedepends+=" cups-devel"
-else
-	configure_args+=" --disable-cups"
-fi
-
-if [ "$build_option_gir" ]; then
-	makedepends+=" gobject-introspection"
-	configure_args+=" --enable-introspection"
-else
-	configure_args+=" --disable-introspection"
-fi
-
-if [ "$build_option_wayland" ]; then
-	hostmakedepends+=" wayland-devel"
-	makedepends+=" libxkbcommon-devel wayland-devel"
-	configure_args+=" --enable-wayland-backend"
-else
-	configure_args+=" --disable-wayland-backend"
-fi
-
-if [ "$build_option_x11" ]; then
-	depends+=" dbus-x11"
-	makedepends+=" libXcursor-devel libXdamage-devel libXext-devel
-		libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel"
-	configure_args+=" --enable-x11-backend"
-else
-	configure_args+=" --disable-x11-backend"
-fi
-
 pre_configure() {
-	rm -f ${XBPS_WRAPPERDIR}/pkg-config
+	sed -i 's,pkg-config,/usr/bin/pkg-config,' autogen.sh
 	NOCONFIGURE=1 ./autogen.sh
 }
 post_install() {