diff --git a/x264/mingw-w64-bootstrap/PKGBUILD b/x264/mingw-w64-bootstrap/PKGBUILD
new file mode 100644
index 00000000..7caa84b7
--- /dev/null
+++ b/x264/mingw-w64-bootstrap/PKGBUILD
@@ -0,0 +1,60 @@
+# Maintainer: Martchus <martchus@gmx.net>
+# Contributor: Karl-Felix Glatzer <karl.glatzer@gmx.de>
+pkgname=mingw-w64-x264-bootstrap
+pkgver=148.20160103
+pkgrel=1
+epoch=1
+pkgdesc='Free library for encoding H264/AVC video streams (mingw-w64)'
+arch=('any')
+url='https://www.videolan.org/developers/x264.html'
+license=('GPL')
+depends=('mingw-w64-crt')
+#provides=('mingw-w64-libx264.so')
+options=(!strip !buildflags staticlibs)
+makedepends=('mingw-w64-gcc' 'yasm' 'git')
+provides=(mingw-w64-freetype ${pkgname%-bootstrap})
+conflicts=(mingw-w64-freetype ${pkgname%-bootstrap})
+_commit=5c6570495f8f1c716b294aee1430d8766a4beb9c
+source=("git://git.videolan.org/x264.git#commit=${_commit}")
+md5sums=('SKIP')
+_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
+
+pkgver() {
+  cd x264
+  local _ver=$(grep '#define X264_BUILD' x264.h | cut -d' ' -f3)
+  local _date=$(git log -1 --format="%cd" --date=short | tr -d -)
+
+  echo ${_ver}.${_date}
+}
+
+build() {
+  for _arch in ${_architectures}; do
+    mkdir -p ${srcdir}/build-${_arch} && cd ${srcdir}/build-${_arch}
+
+    unset LDFLAGS CPPFLAGS
+    ${srcdir}/x264/configure --host=${_arch} \
+      --cross-prefix="${_arch}-" \
+      --enable-win32thread \
+      --enable-shared \
+      --enable-static
+
+    make
+  done
+}
+
+package() {
+  for _arch in ${_architectures}; do
+    cd ${srcdir}/build-${_arch}
+    make DESTDIR="$pkgdir" \
+      bindir=/usr/${_arch}/bin \
+      libdir=/usr/${_arch}/lib \
+      includedir=/usr/${_arch}/include \
+      install
+
+    ${_arch}-strip --strip-all ${pkgdir}/usr/${_arch}/bin/*.exe
+    ${_arch}-strip --strip-unneeded ${pkgdir}/usr/${_arch}/bin/*.dll
+    ${_arch}-strip -g ${pkgdir}/usr/${_arch}/lib/*.a
+  done
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/x264/mingw-w64/PKGBUILD b/x264/mingw-w64/PKGBUILD
index ab9304d7..099f5f85 100644
--- a/x264/mingw-w64/PKGBUILD
+++ b/x264/mingw-w64/PKGBUILD
@@ -1,17 +1,19 @@
+# Maintainer: Karl-Felix Glatzer <karl.glatzer@gmx.de>
+# Contributor: Martchus <martchus@gmx.net>
 pkgname=mingw-w64-x264
-pkgver=148.20150725
+pkgver=148.20160103
 pkgrel=1.1
 epoch=1
-pkgdesc='free library for encoding H264/AVC video streams (mingw-w64)'
+pkgdesc='Free library for encoding H264/AVC video streams (mingw-w64)'
 arch=('any')
-url='http://www.videolan.org/developers/x264.html'
+url='https://www.videolan.org/developers/x264.html'
 license=('GPL')
 depends=('mingw-w64-crt')
 #provides=('mingw-w64-libx264.so')
 options=(!strip !buildflags staticlibs)
-makedepends=('mingw-w64-gcc' 'yasm' 'git')
-_commit=73ae2d11d472d0eb3b7c218dc1659db32f649b14
-source=(git://git.videolan.org/x264.git#commit=${_commit})
+makedepends=('mingw-w64-gcc' 'yasm' 'git' 'mingw-w64-ffmpeg' 'mingw-w64-l-smash')
+_commit=5c6570495f8f1c716b294aee1430d8766a4beb9c
+source=("git://git.videolan.org/x264.git#commit=${_commit}")
 md5sums=('SKIP')
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"