diff --git a/srcpkgs/mongodb/template b/srcpkgs/mongodb/template
index 43fcf10768..9e11c372f7 100644
--- a/srcpkgs/mongodb/template
+++ b/srcpkgs/mongodb/template
@@ -1,7 +1,7 @@
 # Template file for 'mongodb'
 pkgname=mongodb
 version=3.2.0
-revision=2
+revision=3
 hostmakedepends="scons"
 makedepends="boost-devel pcre-devel snappy-devel libressl-devel libpcap-devel
  gperftools-devel libsasl-devel yaml-cpp-devel valgrind-devel"
@@ -29,7 +29,7 @@ _scons_args=" --use-system-boost \
  --nostrip \
  --disable-warnings-as-errors"
 case "$XBPS_TARGET_MACHINE" in
-	i686*) _scons_args+=" --wiredtiger=off";;
+	i686*) _scons_args+=" --wiredtiger=off --storageEngine=mmapv1";;
 esac
 # ETOOHUGE
 nodebug=1
@@ -49,15 +49,21 @@ post_configure() {
 }
 
 do_build() {
-	scons core ${makejobs} \
+	scons core tools ${makejobs} \
+		CC=$CC \
+		CFLAGS="$CFLAGS" \
+		CXX=$CXX \
+		CXXFLAGS="$CXXFLAGS" \
+		LIBPATH="${XBPS_CROSS_BASE}/usr/lib" \
+		CPPPATH="${XBPS_CROSS_BASE}/usr/include" \
 		--prefix="/usr" \
 		$_scons_args
 }
 
 do_install() {
-	scons install \
-		--prefix="${DESTDIR}/usr" \
-		$_scons_args
+	for b in mongos mongod mongosniff mongo mongoperf; do
+		vbin $b
+	done
 
 	vinstall ${FILESDIR}/mongodb.conf 644 etc/mongodb