diff --git a/common/shlibs b/common/shlibs
index 5c723ec03a4..d3838be5536 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -923,7 +923,7 @@ libLLVM-3.3.so libllvm-3.3_4
 libisofs.so.6 libisofs-0.6.24_1
 libbfd-2.22.so binutils-2.22_1<2.23_1
 libopcodes-2.22.so binutils-2.22_1<2.23_1
-libv8.so libv8-3.22.5_1
+libv8.so.3.20 libv8-3.20.17.13_1
 libGeoIP.so.1 libgeoip-1.4.8_1
 libGeoIPUpdate.so.0 libgeoip-1.4.8_1
 libcherokee-base.so.0 libcherokee-1.2.101_1
diff --git a/srcpkgs/v8/template b/srcpkgs/v8/template
index 4b145ee0708..f81070bcb00 100644
--- a/srcpkgs/v8/template
+++ b/srcpkgs/v8/template
@@ -1,13 +1,14 @@
 # Template file for 'v8'
 pkgname=v8
-version=3.22.5
+_sonamever="3.20"
+version=${_sonamever}.17.13
 revision=1
 short_desc="V8 JavaScript Engine"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://code.google.com/p/v8/"
 license="BSD"
 distfiles="http://commondatastorage.googleapis.com/chromium-browser-official/v8-${version}.tar.bz2"
-checksum=31f97ea53d4a197228668686f0ca154a03d455013aaff8bdfc2122b66b8af55f
+checksum=472dcceb944685243b405ec131e3205ef5754110b0031c2cb135a44db6fa8755
 long_desc="
  V8 is Google's open source JavaScript engine. V8 is written in C++ and is
  used in Google Chrome, the open source browser from Google.
@@ -20,31 +21,24 @@ long_desc="
  
  This package contains the v8 utilities and the d8 shell."
 
-hostmakedepends="which subversion python"
+hostmakedepends="which python"
 makedepends="readline-devel"
 
 do_build() {
-	export LINK="$CXX" LD="$CXX"
-
-	# TODO: add support to crosscompile for other targets.
-	if [ "$CROSS_BUILD" ]; then
-		case "${XBPS_TARGET_MACHINE}" in
+	case "${XBPS_TARGET_MACHINE}" in
+		i686|x86_64) target="native";;
 		arm*)
-			# NOTE: hardfp can be problematic if not hf is supported on target cpu
-			sed -e "s/m32flag':.*/m32flag':'',/" -i build/common.gypi
-			LINK="${CXX}" make V=1 ${makejobs} arm.release \
-				hardfp=on library=shared console=readline \
-				disassembler=on snapshot=off \
-				CXX.host=${CXX} CXX.link=${CXX} LINK.target="${CXX}"
+			sed -e "s/m32flag':.*/m32flag':'',/" -i build/toolchain.gypi
+			target="arm.release hardfp=on snapshot=off"
 			;;
-		*)	msg_error "$pkgver: cannot cross compile for ${XBPS_TARGET_MACHINE}.\n"
-			;;
-		esac
-	else
-		# native build
-		make ${makejobs} native library=shared console=readline \
-			disassembler=on liveobjectlist=on
-	fi
+		*) msg_error "$pkgver: unknown target architecture!\n" ;;
+	esac
+
+	LINK=${CXX} make ${makejobs} ${target} i18nsupport=off \
+		werror=no library=shared soname_version=${_sonamever} \
+		console=readline disassembler=on \
+		CXX.host=${CXX} CXX.link=${CXX} LINK.target=${CXX} \
+		BUILTYPE=Release
 }
 
 do_install() {
@@ -52,13 +46,13 @@ do_install() {
 		case "$XBPS_TARGET_MACHINE" in
 		arm*)
 			vinstall out/arm.release/d8 755 usr/bin
-			vinstall out/arm.release/lib.target/lib${pkgname}.so 755 usr/lib
+			vinstall out/arm.release/lib.target/libv8.so.${_sonamever} 755 usr/lib
 			;;
 		esac
 	else
 		# native build
 		vinstall out/native/d8 755 usr/bin
-		vinstall out/native/lib.target/lib${pkgname}.so 755 usr/lib
+		vinstall out/native/lib.target/libv8.so.${_sonamever} 755 usr/lib
 	fi
 	if [ -z "$CROSS_BUILD" ]; then
 		# mksnapshot only built in native builds.
@@ -75,6 +69,8 @@ do_install() {
 	vinstall include/${pkgname}-testing.h 644 usr/include
 	vinstall include/${pkgname}.h 644 usr/include
 	vinstall include/${pkgname}stdint.h 644 usr/include
+
+	ln -sfr ${DESTDIR}/usr/lib/libv8.so.${_sonamever} ${DESTDIR}/usr/lib/libv8.so
 }
 
 v8-devel_package() {
@@ -82,13 +78,14 @@ v8-devel_package() {
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
+		vmove usr/lib/libv8.so
 	}
 }
 
 libv8_package() {
 	short_desc+=" - runtime library"
 	pkg_install() {
-		vmove usr/lib
+		vmove usr/lib/libv8.so.${_sonamever}
 	}
 }