diff --git a/srcpkgs/gwenhywfar/patches.off/cross-build-workaround.pach b/srcpkgs/gwenhywfar/patches.off/cross-build-workaround.pach
new file mode 100644
index 0000000000..b508da9da2
--- /dev/null
+++ b/srcpkgs/gwenhywfar/patches.off/cross-build-workaround.pach
@@ -0,0 +1,23 @@
+File gwenhywfar-4.3.3.orig/.xbps_armv7_6SucMTNj.logpipe is a fifo while file gwenhywfar-4.3.3/.xbps_armv7_6SucMTNj.logpipe is a fifo
+File gwenhywfar-4.3.3.orig/.xbps_armv7_KsFMv1Qo.logpipe is a fifo while file gwenhywfar-4.3.3/.xbps_armv7_KsFMv1Qo.logpipe is a fifo
+File gwenhywfar-4.3.3.orig/.xbps_armv7_QIkTnSMg.logpipe is a fifo while file gwenhywfar-4.3.3/.xbps_armv7_QIkTnSMg.logpipe is a fifo
+File gwenhywfar-4.3.3.orig/.xbps_armv7_RarfsgB5.logpipe is a fifo while file gwenhywfar-4.3.3/.xbps_armv7_RarfsgB5.logpipe is a fifo
+File gwenhywfar-4.3.3.orig/.xbps_armv7_SY7AAK9V.logpipe is a fifo while file gwenhywfar-4.3.3/.xbps_armv7_SY7AAK9V.logpipe is a fifo
+File gwenhywfar-4.3.3.orig/.xbps_armv7_agMX9LAx.logpipe is a fifo while file gwenhywfar-4.3.3/.xbps_armv7_agMX9LAx.logpipe is a fifo
+File gwenhywfar-4.3.3.orig/.xbps_armv7_hQTy1siU.logpipe is a fifo while file gwenhywfar-4.3.3/.xbps_armv7_hQTy1siU.logpipe is a fifo
+File gwenhywfar-4.3.3.orig/.xbps_armv7_iwxoAnUM.logpipe is a fifo while file gwenhywfar-4.3.3/.xbps_armv7_iwxoAnUM.logpipe is a fifo
+File gwenhywfar-4.3.3.orig/.xbps_armv7_ksHFWh65.logpipe is a fifo while file gwenhywfar-4.3.3/.xbps_armv7_ksHFWh65.logpipe is a fifo
+diff -upr gwenhywfar-4.3.3.orig/configure gwenhywfar-4.3.3/configure
+--- gwenhywfar-4.3.3.orig/configure	2014-02-23 13:15:47.692132823 +0100
++++ gwenhywfar-4.3.3/configure	2014-02-23 13:18:58.957118509 +0100
+@@ -18702,8 +18702,8 @@ $as_echo_n "checking for /proc/self/maps
+ if ${ac_cv_file__proc_self_maps+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  test "$cross_compiling" = yes &&
+-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
++  #test "$cross_compiling" = yes &&
++  #as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+ if test -r "/proc/self/maps"; then
+   ac_cv_file__proc_self_maps=yes
+ else
diff --git a/srcpkgs/gwenhywfar/template b/srcpkgs/gwenhywfar/template
index 80350970ba..b17263aae7 100644
--- a/srcpkgs/gwenhywfar/template
+++ b/srcpkgs/gwenhywfar/template
@@ -1,16 +1,37 @@
 # Template file for 'gwenhywfar'
 pkgname=gwenhywfar
 version=4.3.3
-revision=1
-hostmakedepends="pkg-config"
-makedepends="libgcrypt-devel gnutls-devel qt-devel gtk+-devel"
+revision=2
+_dnrel=67
+hostmakedepends="pkg-config libgcrypt-devel automake libtool"
+makedepends="libgcrypt-devel gnutls-devel gtk+-devel"
+configure_args=" --with-guis=gtk2"
 build_style="gnu-configure"
 maintainer="Enno Boland <eb@s01.de>"
 license="LGPL"
 homepage="http://www.aquamaniac.de"
 short_desc="OS abstraction functions for various projects"
-distfiles="http://www2.aquamaniac.de/sites/download/download.php?package=01&release=67&file=01&dummy=gwenhywfar-$version.tar.gz"
+distfiles="http://www2.aquamaniac.de/sites/download/download.php?package=01&release=${_dnrel}&file=01&dummy=gwenhywfar-$version.tar.gz"
 checksum=87ed0f8669e1c21eaa717a18a8cf516b771c00610f5e17148cd36bce0d7d8ec2
+configure_args="--disable-binreloc"
+if [ "$CROSS_BUILD" ]; then
+	configure_args+=" --with-guis=gtk2"
+else
+	makedepends+=" qt-devel"
+fi
+
+pre_configure() {
+	libtoolize
+}
+
+if [ -z "$CROSS_BUILD" ]; then
+	gwenhywfar-qt_package() {
+		short_desc+=" - qt4 bindings"
+		pkg_install() {
+			vmove usr/lib/*-qt4*
+		}
+	}
+fi
 
 gwenhywfar-gtk_package() {
 	short_desc+=" - gtk+2 bindings"
@@ -19,13 +40,6 @@ gwenhywfar-gtk_package() {
 	}
 }
 
-gwenhywfar-qt_package() {
-	short_desc+=" - QT4 bindings"
-	pkg_install() {
-		vmove usr/lib/*-qt4*
-	}
-}
-
 gwenhywfar-devel_package() {
 	short_desc+=" - development files"
 	pkg_install() {