diff --git a/srcpkgs/js/template b/srcpkgs/js/template
index 6fa3ba4fe63..fc3735ce626 100644
--- a/srcpkgs/js/template
+++ b/srcpkgs/js/template
@@ -1,29 +1,50 @@
 # Template file for 'js'
 pkgname=js
 version=1.8.5
-revision=5
+revision=6
 build_wrksrc="js/src"
 build_style=gnu-configure
-configure_args="--with-system-nspr --enable-threadsafe"
-makedepends="zip python perl>=0 nspr-devel"
+hostmakedepends="zip python perl nspr-devel"
+makedepends="nspr-devel"
 short_desc="Spidermonkey JavaScript interpreter and library"
 homepage="https://developer.mozilla.org/en/docs/SpiderMonkey"
 license="MPL-1.1, GPL-2, LGPL-2.1"
 maintainer="Juan RP <xtraeme@gmail.com>"
 distfiles="${MOZILLA_SITE}/js/js185-1.0.0.tar.gz"
 checksum=5d12f7e1f5b4a99436685d97b9b7b75f094d33580227aa998c406bbae6f2a687
-long_desc="
- SpiderMonkey 1.8.5 is the JavaScript engine that shipped in Firefox 4.0.
- It is much faster than SpiderMonkey 1.8, implements ES-5 (ECMA 262,
- 5th Edition), and contains many new language and API features."
+
+do_configure() {
+	local _args
+
+	if [ "$CROSS_BUILD" ]; then
+		export HOST_CC=cc
+		export HOST_CXX=g++
+		export HOST_CFLAGS="-Os -DFORCE_LITTLE_ENDIAN"
+		export HOST_CXXFLAGS="-Os -DFORCE_LITTLE_ENDIAN"
+
+		case "$XBPS_MACHINE" in
+			armv6l*) _args+=" --with-cpu-arch=armv6";;
+			armv7l*) _args+=" --with-cpu-arch=armv7";;
+		esac
+		_args+=" --target=$XBPS_CROSS_TRIPLET"
+
+		sed -e "s,-march=armv7-a -marm -mfloat-abi=softfp,${CFLAGS},g" -i configure
+		sed -e "s,-march=armv7 -marm -msoftfp,${CFLAGS},g" -i configure
+	fi
+
+	./configure --prefix=/usr --with-system-nspr --enable-threadsafe ${_args}
+
+	sed -e 's,-L/usr/lib,,g' -i config/autoconf.mk
+}
 
 js-devel_package() {
-	depends="nspr-devel js>=${version}"
+	depends="nspr-devel js>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin
 		vmove usr/include
 		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
 		vmove usr/lib/pkgconfig
 	}
 }