diff --git a/srcpkgs/gtk-vnc/patches/fix-acinclude_m4.patch b/srcpkgs/gtk-vnc/patches/fix-acinclude_m4.patch
new file mode 100644
index 00000000000..ce08d32aa50
--- /dev/null
+++ b/srcpkgs/gtk-vnc/patches/fix-acinclude_m4.patch
@@ -0,0 +1,26 @@
+--- acinclude.m4	2015-02-10 11:48:32.000000000 +0100
++++ 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)
+ ])
diff --git a/srcpkgs/gtk-vnc/template b/srcpkgs/gtk-vnc/template
index b9390e01802..64ac5e0182d 100644
--- a/srcpkgs/gtk-vnc/template
+++ b/srcpkgs/gtk-vnc/template
@@ -1,34 +1,47 @@
 # Template file for 'gtk-vnc'
 pkgname=gtk-vnc
 version=0.5.4
-revision=1
-hostmakedepends="perl pkg-config intltool glib-devel $(vopt_if gir gobject-introspection)"
-makedepends="gtk+-devel gtk+3-devel gnutls-devel libsasl-devel vala-devel python-devel pygtk-devel"
+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
+ libsasl-devel $(vopt_if gir vala-devel) python-devel pygtk-devel"
 short_desc="VNC viewer widget for GTK"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.gnome.org"
 license="GPL-2"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=488aa97a76ce6868160699cd45d4a0ee0fe6f0ad4631737c6ddd84450f6c9ce7
-
 build_options="gir"
 if [ -z "$CROSS_BUILD" ]; then
 	build_options_default="gir"
 fi
 
+CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/python2.7"
 post_extract() {
 	cp -a ${wrksrc} /tmp/gtk2-build
 	cp -a ${wrksrc} /tmp/gtk3-build
 	mv /tmp/gtk[23]-build ${wrksrc}
 }
-
+pre_configure() {
+	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" \
+		autoreconf -if
+}
 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)
 }
 
@@ -63,8 +76,8 @@ gtk2-vnc-devel_package() {
 	short_desc+=" - GTK+2 development files"
 	pkg_install() {
 		vmove usr/include/gtk-vnc-1.0
-		#vmove usr/share/vala/vapi/gtk-vnc-1.0.vapi
 		if [ "$build_option_gir" ]; then
+			#vmove usr/share/vala/vapi/gtk-vnc-1.0.vapi
 			vmove usr/share/gir-1.0/GtkVnc-1.0.gir
 		fi
 		vmove usr/lib/pkgconfig/gtk-vnc-1.0.pc
@@ -86,10 +99,10 @@ gtk-vnc-devel_package() {
 		vmove usr/include/gtk-vnc-2.0
 		vmove usr/lib/pkgconfig/gtk-vnc-2.0.pc
 		vmove usr/lib/pkgconfig/gvnc-1.0.pc
-		vmove usr/share/vala/vapi/gtk-vnc-2.0.deps
-		vmove usr/share/vala/vapi/gtk-vnc-2.0.vapi
-		vmove usr/share/vala/vapi/gvnc-1.0.vapi
 		if [ "$build_option_gir" ]; then
+			vmove usr/share/vala/vapi/gtk-vnc-2.0.deps
+			vmove usr/share/vala/vapi/gtk-vnc-2.0.vapi
+			vmove usr/share/vala/vapi/gvnc-1.0.vapi
 			vmove usr/share/gir-1.0/GVnc-1.0.gir
 			vmove usr/share/gir-1.0/GtkVnc-2.0.gir
 		fi