diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix
new file mode 100644
index 00000000000..9b8cee26868
--- /dev/null
+++ b/pkgs/development/libraries/x264/default.nix
@@ -0,0 +1,18 @@
+args:
+args.stdenv.mkDerivation rec {
+  version = "snapshot-20080521-2245";
+  name = "x264-${version}";
+
+  src = args.fetchurl {
+    url = "ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-${version}.tar.bz2";
+    sha256 = "07khxih1lmhvrzlaksqmaghbi8w2yyjrjcw867gi2y4z1h0ndhks";
+  };
+
+  buildInputs =(with args; []);
+
+  meta = { 
+      description = "library for encoding H264/AVC video streams";
+      homepage = http://www.videolan.org/developers/x264.html;
+      license = "GPL";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e780867e36e..279a04d7732 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3291,6 +3291,10 @@ let pkgs = rec {
 
   wxGTK28 = wxGTK28deps null;
 
+  x264 = import ../development/libraries/x264 {
+    inherit fetchurl stdenv;
+  };
+
   Xaw3d = import ../development/libraries/Xaw3d {
     inherit fetchurl stdenv x11 bison;
     flex = flex2533;