diff --git a/common/shlibs b/common/shlibs
index ef9a3b374ca..23245fa9546 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -382,7 +382,7 @@ libavutil.so.52 libavutil-1.2.1_1
 libavfilter.so.3 libavfilter-1.0.1_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.120 x264-20120126_1
+libx264.so.136 x264-20131007_1
 libxvidcore.so.4 xvidcore-1.2.2_1
 libtag.so.1 taglib-1.6.1_1
 libtag_c.so.0 taglib-1.6.1_1
diff --git a/srcpkgs/x264/template b/srcpkgs/x264/template
index bae02a1a94c..b64550a61a7 100644
--- a/srcpkgs/x264/template
+++ b/srcpkgs/x264/template
@@ -1,9 +1,9 @@
 # Template file for 'x264'
 pkgname=x264
-_snap_date=20120126
+_snap_date=20131007
 _snap_rev=2245
 version="${_snap_date}.${_snap_rev}"
-revision=3
+revision=1
 wrksrc="x264-snapshot-${_snap_date}-${_snap_rev}-stable"
 hostmakedepends="yasm"
 short_desc="Free library for encoding H264/AVC video streams"
@@ -11,19 +11,17 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 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=6270fcc6e2ef133e4db2b2e0f4f22b5dbdd9a637e979b5697014b698f0d56baa
-long_desc="
- Stable snapshot version of x264, a high quality H.264 codec."
+checksum=15267912eef265d974f41f4ea09795503adc26dc190a2d437799ca043bb8e2b4
 
 do_configure() {
 	if [ "$XBPS_TARGET_MACHINE" != "i686" -o "$XBPS_TARGET_MACHINE" != "x86_64" ]; then
-		_disable_asm="--disable-asm"
+		args+=" --disable-asm"
 	fi
 	if [ "$CROSS_BUILD" ]; then
-		_cross="--host=$XBPS_CROSS_TRIPLET"
+		args+=" --host=$XBPS_CROSS_TRIPLET"
 	fi
-	./configure --disable-swscale --enable-static --enable-pic \
-		--enable-shared ${_disable_asm} ${_cross}
+	./configure --prefix=/usr --disable-swscale --enable-static \
+		--enable-pic --enable-shared --disable-opencl ${args}
 }
 
 do_build() {
@@ -33,22 +31,23 @@ do_build() {
 do_install() {
 	make DESTDIR=${DESTDIR} \
 		bindir=/usr/bin libdir=/usr/lib includedir=/usr/include install
-	# Set version as 0.120.0 in pkg-config file.
-	sed -i -e "s|0.120.x|0.120.0|g" ${DESTDIR}/usr/lib/pkgconfig/x264.pc
+	# Set version as x.x.0 in pkg-config file.
+	sed -i -e "s|.x|.0|" ${DESTDIR}/usr/lib/pkgconfig/x264.pc
 }
 
 x264-devel_package() {
 	depends="x264>=${version}"
-	short_desc="${short_desc} -- development files"
+	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
 	}
 }
 
 x264_package() {
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }