diff --git a/common/shlibs b/common/shlibs
index a0f88dc12f2..ba55983bcba 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -387,7 +387,7 @@ libavutil.so.55 libavutil-3.1.3_1
 libavfilter.so.6 libavfilter-3.1.3_1
 libSDL-1.2.so.0 SDL-1.2.14_1
 libSDL_image-1.2.so.0 SDL_image-1.2.10_1
-libx264.so.142 x264-20140928.2245_1
+libx264.so.152 x264-20140928.2245_1
 libxvidcore.so.4 xvidcore-1.2.2_1
 libtag.so.1 taglib-1.6.1_1
 libtag-extras.so.1 taglib-extras-1.0.1_1
diff --git a/srcpkgs/x264/template b/srcpkgs/x264/template
index d69317c7ae8..292e8143650 100644
--- a/srcpkgs/x264/template
+++ b/srcpkgs/x264/template
@@ -1,22 +1,24 @@
 # Template file for 'x264'
 pkgname=x264
-_snap_date=20141218
+_snap_date=20180119
 _snap_rev=2245
 version="${_snap_date}.${_snap_rev}"
 revision=1
 wrksrc="x264-snapshot-${_snap_date}-${_snap_rev}-stable"
-hostmakedepends="yasm perl"
+hostmakedepends="nasm perl"
 short_desc="Free library for encoding H264/AVC video streams"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.videolan.org/developers/x264.html"
 license="GPL-2"
 distfiles="http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${_snap_date}-${_snap_rev}-stable.tar.bz2"
-checksum=3519e8fa3399845c7d2248d0a7297a923ac6bdc78d0ec15e85026e810670e1be
+checksum=32b54ad52ee29c82be3882b8907d0177832ec0aaa78210dd88f46784f771b04f
 
 do_configure() {
+	local args
 	case "$XBPS_TARGET_MACHINE" in
-		armv[56]*) args+=" --disable-asm";;
-		armv7*) export AS=$CC;;
+		armv5*|mips*) args+=" --disable-asm";;
+		aarch64*|armv[67]*) export AS=$CC;;
+		*) export AS=nasm;;
 	esac
 	if [ "$CROSS_BUILD" ]; then
 		args+=" --host=$XBPS_CROSS_TRIPLET"