diff --git a/srcpkgs/boinc/template b/srcpkgs/boinc/template
index e9e7a1bce48..1ca45a5d4d3 100644
--- a/srcpkgs/boinc/template
+++ b/srcpkgs/boinc/template
@@ -5,8 +5,9 @@ revision=1
 wrksrc=boinc-client_release-${version%.*}-${version}
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config python"
-makedepends="glu-devel libfreeglut-devel libcurl-devel wxWidgets-devel webkitgtk2-devel
- libjpeg-turbo-devel libnotify-devel sqlite-devel libXmu-devel libXi-devel"
+makedepends="glu-devel libfreeglut-devel libcurl-devel
+ libjpeg-turbo-devel libnotify-devel sqlite-devel libxcb-devel
+ libXmu-devel libXi-devel gtk+-devel webkitgtk2-devel wxWidgets-devel"
 depends="curl ca-certificates"
 system_accounts="boinc"
 boinc_homedir="/var/lib/boinc"
@@ -19,7 +20,6 @@ homepage="https://boinc.berkeley.edu/"
 distfiles="https://github.com/BOINC/boinc/archive/client_release/${version%.*}/${version}.tar.gz>boinc-${version}.tar.gz"
 checksum=ed5f3dcdc8d1cc5277529afb701377e77d1ff89711368a7456553bf249940bad
 conflicts="boinc-nox>=0"
-nocross="Currently broken - investigating"
 
 CXXFLAGS="-Wno-redundant-decls"
 
@@ -27,13 +27,29 @@ pre_configure() {
 	autoreconf -if
 }
 do_configure() {
+	if [ -n "$CROSS_BUILD" ]; then
+		# XXX: cross building used to be a lot easier
+		# Set include paths for configure to find dependencies.
+		CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/glib-2.0"
+		CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/lib/glib-2.0/include"
+		CFLAGS+=" $(pkg-config --cflags gtk+-2.0)"
+		CXXFLAGS+=" ${CFLAGS}"
+		echo "CFLAGS:   $CFLAGS"
+		echo "CXXFLAGS: $CXXFLAGS"
+		export LIBNOTIFY_CFLAGS="${CFLAGS}"
+		export LIBNOTIFY_LIBS="-L${XBPS_CROSS_BASE}/usr/lib -lnotify"
+	fi
 	mkdir /tmp/x11
 	mv * /tmp/x11
 	mv /tmp/x11 .
 	mkdir nox
 	cp -ar x11/* nox
+
 	cd ${wrksrc}/x11
-	LDFLAGS="${LDFLAGS} -lX11" ./configure \
+	PKG_CONFIG=pkg-config \
+	PKG_CONFIG_PATH=${XBPS_CROSS_BASE}/usr/lib/pkgconfig \
+	LDFLAGS="${LDFLAGS} -lX11" \
+	./configure \
 		${configure_args} \
 		--enable-libraries \
 		--enable-unicode \
@@ -43,12 +59,15 @@ do_configure() {
 		--enable-client \
 		--enable-manager \
 		--disable-server \
-		--with-ssl \
-		--with-x \
+		--with-ssl=${XBPS_CROSS_BASE}/usr \
+		--with-x=${XBPS_CROSS_BASE}/usr \
 		--with-wx-config=/usr/bin/wx-config-3.0 \
 		--with-wxdir=${XBPS_CROSS_BASE}/usr/lib
+
 	cd ${wrksrc}/nox
-	PKG_CONFIG=/usr/bin/pkg-config ./configure \
+	PKG_CONFIG=pkg-config \
+	PKG_CONFIG_PATH=${XBPS_CROSS_BASE}/usr/lib/pkgconfig \
+	./configure \
 		${configure_args} \
 		--enable-libraries \
 		--enable-unicode \
@@ -60,7 +79,7 @@ do_configure() {
 		--disable-server \
 		--disable-xss \
 		--disable-server \
-		--with-ssl \
+		--with-ssl=${XBPS_CROSS_BASE}/usr \
 		--without-x \
 		--without-wxdir
 }