diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix
index 51666e3ba6d..6c541f1aa68 100644
--- a/pkgs/development/libraries/x264/default.nix
+++ b/pkgs/development/libraries/x264/default.nix
@@ -1,12 +1,12 @@
-{stdenv, fetchurl, yasm}:
+{stdenv, fetchurl, yasm, enable10bit ? false}:
 
 stdenv.mkDerivation rec {
-  version = "snapshot-20130424-2245-stable";
-  name = "x264-20130424_2245";
+  version = "snapshot-20141218-2245-stable";
+  name = "x264-20141218-2245";
 
   src = fetchurl {
     url = "ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-${version}.tar.bz2";
-    sha256 = "0vzyqsgrm9k3hzka2p8ib92jl0ha8d4267r2rb3pr9gmpjaj9azk";
+    sha256 = "1gp1f0382vh2hmgc23ldqyywcfljg8lsgl2849ymr14r6gxfh69m";
   };
 
   patchPhase = ''
@@ -14,13 +14,16 @@ stdenv.mkDerivation rec {
   '';
 
   configureFlags = [ "--enable-shared" ]
-    ++ stdenv.lib.optional (!stdenv.isi686) "--enable-pic";
+    ++ stdenv.lib.optional (!stdenv.isi686) "--enable-pic"
+    ++ stdenv.lib.optional (enable10bit) "--bit-depth=10";
 
   buildInputs = [ yasm ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "library for encoding H264/AVC video streams";
-    homepage = http://www.videolan.org/developers/x264.html;
-    license = "GPL";
+    homepage    = http://www.videolan.org/developers/x264.html;
+    license     = licenses.gpl2;
+    platforms   = platforms.unix;
+    maintainers = [ maintainers.spwhitt ];
   };
 }