diff --git a/srcpkgs/geda/template b/srcpkgs/geda/template
index 5ba2189e57c..1492d6267f9 100644
--- a/srcpkgs/geda/template
+++ b/srcpkgs/geda/template
@@ -4,7 +4,7 @@ version=1.8.2
 revision=6
 wrksrc="${pkgname}-gaf-${version}"
 build_style=gnu-configure
-configure_args="--disable-update-desktop-database --disable-update-mime-database"
+configure_args="--with-sysroot=/${XBPS_CROSS_BASE}"
 hostmakedepends="pkg-config guile desktop-file-utils shared-mime-info"
 makedepends="gc-devel gtk+-devel guile-devel"
 depends="guile geda-data"
@@ -15,6 +15,10 @@ homepage="http://www.geda-project.org/"
 distfiles="http://ftp.geda-project.org/geda-gaf/stable/v${version%.*}/${version}/geda-gaf-${version}.tar.gz"
 checksum=bbf4773aef1b5a51a8d6f4c3fa288c047340cc62dd6e14d7928fcc6e4051b721
 
+if [ "${XBPS_ARCH}" = "x86_64" ]; then
+	hostmakedepends+=" glibc-devel-32bit"
+fi
+
 geda-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"