diff --git a/srcpkgs/gtk-vnc/patches/fix-acinclude_m4.patch b/srcpkgs/gtk-vnc/patches/fix-acinclude_m4.patch
index ce08d32aa50..62f10eee847 100644
--- a/srcpkgs/gtk-vnc/patches/fix-acinclude_m4.patch
+++ b/srcpkgs/gtk-vnc/patches/fix-acinclude_m4.patch
@@ -1,5 +1,31 @@
---- acinclude.m4	2015-02-10 11:48:32.000000000 +0100
-+++ acinclude.m4	2015-10-20 00:18:15.784111110 +0200
+--- gtk2-build/acinclude.m4	2015-02-10 11:48:32.000000000 +0100
++++ gtk2-build/acinclude.m4	2015-10-20 00:18:15.784111110 +0200
+@@ -6,20 +6,8 @@
+   [AC_REQUIRE([AM_PATH_PYTHON])
+     AC_MSG_CHECKING(for headers required to compile python extensions)
+     dnl deduce PYTHON_INCLUDES
+-    py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
+-    py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
+-    PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
+-    if test "$py_prefix" != "$py_exec_prefix"; then
+-       PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
+-    fi
++    PYTHON_INCLUDES="-I${XBPS_CROSS_BASE}/include/python${PYTHON_VERSION}"
+     AC_SUBST(PYTHON_INCLUDES)
++    have_python_headers=yes
+-    dnl check if the headers exist:
+-    save_CPPFLAGS="$CPPFLAGS"
+-    CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
+-    AC_TRY_CPP([#include <Python.h>],dnl
+-    [AC_MSG_RESULT(found)
+-       $1],dnl
+-       [AC_MSG_RESULT(not found)
+-       $2])
+-    CPPFLAGS="$save_CPPFLAGS"
++    AC_MSG_RESULT(ok)
+ ])
+--- gtk3-build/acinclude.m4	2015-02-10 11:48:32.000000000 +0100
++++ gtk3-build/acinclude.m4	2015-10-20 00:18:15.784111110 +0200
 @@ -6,20 +6,8 @@
    [AC_REQUIRE([AM_PATH_PYTHON])
      AC_MSG_CHECKING(for headers required to compile python extensions)
diff --git a/srcpkgs/gtk-vnc/template b/srcpkgs/gtk-vnc/template
index 64ac5e0182d..4bec8c13e5e 100644
--- a/srcpkgs/gtk-vnc/template
+++ b/srcpkgs/gtk-vnc/template
@@ -1,11 +1,12 @@
 # Template file for 'gtk-vnc'
 pkgname=gtk-vnc
 version=0.5.4
-revision=2
-hostmakedepends="automake libtool perl pkg-config intltool glib-devel pygtk-devel
- $(vopt_if gir gobject-introspection)"
-makedepends="gettext-devel gtk+-devel gtk+3-devel gnutls-devel libgcrypt-devel
+revision=3
+hostmakedepends="automake libtool perl pkg-config intltool gettext-devel
+ glib-devel pygtk-devel libgcrypt-devel gobject-introspection"
+makedepends="gtk+-devel gtk+3-devel gnutls-devel libgcrypt-devel
  libsasl-devel $(vopt_if gir vala-devel) python-devel pygtk-devel"
+configure_args="$(vopt_enable gir introspection)"
 short_desc="VNC viewer widget for GTK"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.gnome.org"
@@ -21,27 +22,29 @@ CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/python2.7"
 post_extract() {
 	cp -a ${wrksrc} /tmp/gtk2-build
 	cp -a ${wrksrc} /tmp/gtk3-build
+	rm -r ${wrksrc}/*
 	mv /tmp/gtk[23]-build ${wrksrc}
 }
 pre_configure() {
+	local build
 	if [ "$CROSS_BUILD" ]; then
-		sed -i configure.ac \
-			-e"s;GOBJECT_INTROSPECTION_CHECK.*;AM_CONDITIONAL([HAVE_INTROSPECTION], [false]);"
 		find . -name "Makefile.*" -exec sed -i "{}" \
 			-e"s;\(\$(CODEGENDIR)\);${XBPS_CROSS_BASE}/\1;" \
 			-e"s;\(\$(DEFSDIR)\);${XBPS_CROSS_BASE}/\1;" \
 			\;
 	fi
-	ACLOCAL_FLAGS="-I ${XBPS_CROSS_BASE}/usr/share/aclocal" \
+	for build in gtk2-build gtk3-build; do
+		cd ${wrksrc}/${build}
 		autoreconf -if
+	done
 }
 do_configure() {
 	cd ${wrksrc}/gtk2-build
-	../configure ${configure_args} --with-python --disable-static \
+	./configure ${configure_args} --with-python --disable-static \
 		--with-gtk=2.0 $(vopt_enable gir introspection)
 
 	cd ${wrksrc}/gtk3-build
-	../configure ${configure_args} --with-python --disable-static \
+	./configure ${configure_args} --with-python --disable-static \
 		--with-gtk=3.0 $(vopt_enable gir introspection)
 }