diff --git a/multimedia/video/x264/actions.py b/multimedia/video/x264/actions.py
new file mode 100644
index 0000000000..3540265c48
--- /dev/null
+++ b/multimedia/video/x264/actions.py
@@ -0,0 +1,55 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+#
+# Licensed under the GNU General Public License, version 3.
+# See the file http://www.gnu.org/licenses/gpl.txt
+
+from pisi.actionsapi import get
+from pisi.actionsapi import autotools
+from pisi.actionsapi import pisitools
+from pisi.actionsapi import shelltools
+
+verMAJOR = "0"
+verMINOR = "0"
+staticlibfile = "/usr/lib/libx264.a"
+
+pisitools.cflags.sub("-O[\ds]", "-O3")
+
+def getMinorVersion():
+    f = file("x264.h").read()
+    for i in f.split("\n"):
+        if i.startswith("#define X264_BUILD"):
+            return i.split()[-1]
+
+    return "0"
+
+def setup():
+    shelltools.export("CFLAGS", "%s -O3" % get.CFLAGS())
+
+    # force using shared gpac
+    pisitools.dosed("configure", "-lgpac_static", "-lgpac")
+
+    # these disables are here to prevent circular deps, especially with ffmpeg
+    autotools.rawConfigure("--prefix=/usr \
+                            --enable-pic \
+                            --enable-shared \
+                            --disable-avs \
+                            --disable-ffms \
+                            --disable-lavf \
+                            --disable-swscale \
+                            --bit-depth=10 \
+                           ")
+
+def build():
+    autotools.make()
+
+def install():
+    autotools.install()
+
+    #verMINOR = getMinorVersion()
+    #pisitools.dosym("libx264.so.%s.%s" % (verMAJOR, verMINOR), "/usr/lib/libx264.so.%s" % verMAJOR)
+
+    # No static libs
+    if shelltools.isFile("%s/%s" % (get.installDIR(), staticlibfile)):
+        pisitools.remove(staticlibfile)
+
diff --git a/multimedia/video/x264/pspec.xml b/multimedia/video/x264/pspec.xml
new file mode 100644
index 0000000000..023a8c35f0
--- /dev/null
+++ b/multimedia/video/x264/pspec.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" ?>
+<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
+<PISI>
+    <Source>
+        <Name>x264</Name>
+        <Homepage>http://developers.videolan.org/x264.html</Homepage>
+        <Packager>
+            <Name>PisiLinux Community</Name>
+            <Email>admins@pisilinux.org</Email>
+        </Packager>
+        <License>GPLv2</License>
+        <IsA>library</IsA>
+        <IsA>app:console</IsA>
+        <Summary>Open source H264/AVC encoder</Summary>
+        <Description>x264 is a free library for encoding H264/AVC video streams.</Description>
+        <!-- Archives come from http://download.videolan.org/pub/videolan/x264/snapshots/ -->
+        <Archive sha1sum="4c1ef4fdaf22a40f23dc6dafb0eda6b45b0c4ba0" type="tarbz2">ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20141201-2245.tar.bz2</Archive>
+        <BuildDependencies>
+            <Dependency>yasm-devel</Dependency>
+        </BuildDependencies>
+    </Source>
+
+    <Package>
+        <Name>x264</Name>
+        <Files>
+            <Path fileType="executable">/usr/bin</Path>
+            <Path fileType="library">/usr/lib</Path>
+        </Files>
+    </Package>
+
+    <Package>
+        <Name>x264-devel</Name>
+        <Summary>Development files for x264</Summary>
+        <RuntimeDependencies>
+            <Dependency release="current">x264</Dependency>
+        </RuntimeDependencies>
+        <Files>
+            <Path fileType="header">/usr/include</Path>
+            <Path fileType="data">/usr/lib/pkgconfig</Path>
+        </Files>
+    </Package>
+
+    <History>
+        <Update release="6">
+            <Date>2014-12-02</Date>
+            <Version>2245</Version>
+            <Comment>Version bump</Comment>
+            <Name>Stefan Gronewold(groni)</Name>
+            <Email>groni@pisilinux.org</Email>
+        </Update>
+        <Update release="5">
+            <Date>2014-06-18</Date>
+            <Version>2245</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Yusuf Aydemir</Name>
+            <Email>yusuf.aydemir@pisilinux.org</Email>
+        </Update>
+        <Update release="4">
+            <Date>2014-04-05</Date>
+            <Version>0.0_20140404</Version>
+            <Comment>Version bump</Comment>
+            <Name>Marcin Bojara</Name>
+            <Email>marcin@pisilinux.org</Email>
+        </Update>
+        <Update release="3">
+            <Date>2014-02-17</Date>
+            <Version>0.0_20130705</Version>
+            <Comment>Rebuild.</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admins@pisilinux.org</Email>
+        </Update>
+        <Update release="2">
+            <Date>2013-07-06</Date>
+            <Version>0.0_20130705</Version>
+            <Comment>Version bump</Comment>
+            <Name>Marcin Bojara</Name>
+            <Email>marcin@pisilinux.org</Email>
+        </Update>
+        <Update release="1">
+            <Date>2012-09-30</Date>
+            <Version>0.0_20120929</Version>
+            <Comment>First release</Comment>
+            <Name>Erdem Artan</Name>
+            <Email>admins@pisilinux.org</Email>
+        </Update>
+    </History>
+</PISI>
diff --git a/multimedia/video/x264/translations.xml b/multimedia/video/x264/translations.xml
new file mode 100644
index 0000000000..efcdba2c1d
--- /dev/null
+++ b/multimedia/video/x264/translations.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" ?>
+<PISI>
+    <Source>
+        <Name>x264</Name>
+        <Summary xml:lang="tr">Açık kaynak kodlu H264/AVC çözücü</Summary>
+        <Description xml:lang="tr">x264 H264/AVC görüntü dosyalarını açmak için kullanılan bir kütüphane</Description>
+    </Source>
+
+    <Package>
+        <Name>x264-devel</Name>
+        <Summary xml:lang="tr">x264 için geliştirme dosyaları</Summary>
+    </Package>
+</PISI>