diff --git a/packages/multimedia/ffmpeg/build b/packages/multimedia/ffmpeg/build
deleted file mode 100755
index 9e8467fd61..0000000000
--- a/packages/multimedia/ffmpeg/build
+++ /dev/null
@@ -1,208 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  OpenELEC is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-. config/options $1
-
-if [ "$DEBUG" = yes ]; then
-  FFMPEG_DEBUG="--enable-debug --disable-stripping"
-else
-  FFMPEG_DEBUG="--disable-debug --enable-stripping"
-fi
-
-if [ "$OPTIMIZATIONS" = size ]; then
-  FFMPEG_OPTIM="--disable-small"
-else
-  FFMPEG_OPTIM="--disable-small"
-fi
-
-if [ "$CRYSTALHD" = yes ]; then
-# disabled, we use XBMC's internal solution
-  FFMPEG_CRYSTALHD="--disable-crystalhd"
-else
-  FFMPEG_CRYSTALHD="--disable-crystalhd"
-fi
-
-if [ "$VAAPI" = yes ]; then
-  FFMPEG_VAAPI="--enable-vaapi"
-else
-  FFMPEG_VAAPI="--disable-vaapi"
-fi
-
-if [ "$VDPAU" = yes ]; then
-  FFMPEG_VDPAU="--enable-vdpau"
-else
-  FFMPEG_VDPAU="--disable-vdpau"
-fi
-
-case "$TARGET_ARCH" in
-  arm)
-      FFMPEG_CPU=""
-      FFMPEG_TABLES="--enable-hardcoded-tables"
-      FFMPEG_PIC="--enable-pic"
-  ;;
-  i?86)
-      FFMPEG_CPU=""
-      FFMPEG_TABLES="--disable-hardcoded-tables"
-      FFMPEG_PIC="--disable-pic"
-  ;;
-  x86_64)
-      FFMPEG_CPU=""
-      FFMPEG_TABLES="--disable-hardcoded-tables"
-      FFMPEG_PIC="--enable-pic"
-  ;;
-esac
-
-case "$TARGET_FPU" in
-  neon*)
-      FFMPEG_FPU="--enable-neon"
-  ;;
-  vfp*)
-      FFMPEG_FPU=""
-  ;;
-  *)
-      FFMPEG_FPU=""
-  ;;
-esac
-
-export pkg_config="$ROOT/$TOOLCHAIN/bin/pkg-config"
-
-# ffmpeg fails building with LTO support
-  strip_lto
-
-# ffmpeg fails running with GOLD support
-  strip_gold
-
-#LDFLAGS="$(echo "$LDFLAGS" | sed "s/-Wl,-Bsymbolic-functions//g")"
-
-cd $PKG_BUILD/
-./configure --prefix=/usr \
-            --cpu=$TARGET_CPU \
-            --arch=$TARGET_ARCH \
-            --enable-cross-compile \
-            --cross-prefix=$TARGET_PREFIX \
-            --sysroot=$SYSROOT_PREFIX \
-            --sysinclude="$SYSROOT_PREFIX/usr/include" \
-            --target-os="linux" \
-            --nm="$NM" \
-            --ar="$AR" \
-            --as="$CC" \
-            --cc="$CC" \
-            --ld="$CC" \
-            --host-cc="$HOST_CC" \
-            --host-cflags="$HOST_CFLAGS" \
-            --host-ldflags="$HOST_LDFLAGS" \
-            --host-libs="-lm" \
-            --extra-cflags="$CFLAGS" \
-            --extra-ldflags="$LDFLAGS" \
-            --extra-libs="" \
-            --extra-version="" \
-            --build-suffix="" \
-            --disable-static \
-            --enable-shared \
-            --enable-gpl \
-            --disable-version3 \
-            --disable-nonfree \
-            --enable-logging \
-            --disable-doc \
-            $FFMPEG_DEBUG \
-            $FFMPEG_PIC \
-            --enable-optimizations \
-            --disable-extra-warnings \
-            --disable-ffprobe \
-            --disable-ffplay \
-            --disable-ffserver \
-            --enable-ffmpeg \
-            --enable-avdevice \
-            --enable-avcodec \
-            --enable-avformat \
-            --enable-swscale \
-            --enable-postproc \
-            --enable-avfilter \
-            --disable-devices \
-            --enable-pthreads \
-            --disable-w32threads \
-            --disable-x11grab \
-            --enable-network \
-            --enable-gnutls \
-            --disable-gray \
-            --enable-swscale-alpha \
-            $FFMPEG_OPTIM \
-            --enable-dct \
-            --enable-fft \
-            --enable-mdct \
-            --enable-rdft \
-            $FFMPEG_CRYSTALHD \
-            $FFMPEG_VAAPI \
-            $FFMPEG_VDPAU \
-            --disable-dxva2 \
-            --enable-runtime-cpudetect \
-            $FFMPEG_TABLES \
-            --disable-memalign-hack \
-            --disable-encoders \
-            --enable-encoder=ac3 \
-            --enable-encoder=aac \
-            --disable-decoder=mpeg_xvmc \
-            --enable-hwaccels \
-            --disable-muxers \
-            --enable-muxer=spdif \
-            --enable-muxer=adts \
-            --enable-demuxers \
-            --enable-parsers \
-            --enable-bsfs \
-            --enable-protocol=http \
-            --disable-indevs \
-            --disable-outdevs \
-            --enable-filters \
-            --disable-avisynth \
-            --enable-bzlib \
-            --disable-frei0r \
-            --disable-libopencore-amrnb \
-            --disable-libopencore-amrwb \
-            --disable-libopencv \
-            --disable-libdc1394 \
-            --disable-libfaac \
-            --disable-libfreetype \
-            --disable-libgsm \
-            --disable-libmp3lame \
-            --disable-libnut \
-            --disable-libopenjpeg \
-            --disable-librtmp \
-            --disable-libschroedinger \
-            --disable-libspeex \
-            --disable-libtheora \
-            --disable-libvo-aacenc \
-            --disable-libvo-amrwbenc \
-            --enable-libvorbis --enable-muxer=ogg --enable-encoder=libvorbis \
-            --disable-libvpx \
-            --disable-libx264 \
-            --disable-libxavs \
-            --disable-libxvid \
-            --enable-zlib \
-            --enable-asm \
-            --disable-altivec \
-            $FFMPEG_CPU \
-            $FFMPEG_FPU \
-            --disable-vis \
-            --enable-yasm \
-            --disable-sram \
-            --disable-symver \
-
-make V=1
-$MAKEINSTALL
diff --git a/packages/multimedia/ffmpeg/install b/packages/multimedia/ffmpeg/install
deleted file mode 100755
index 74e06c0967..0000000000
--- a/packages/multimedia/ffmpeg/install
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  OpenELEC is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-. config/options $1
-
-mkdir -p $INSTALL/usr/bin
-  cp $PKG_BUILD/ffmpeg $INSTALL/usr/bin
-
-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/*/*.so* $INSTALL/usr/lib
-
-mkdir -p $INSTALL/usr/share/ffmpeg
-  cp $PKG_BUILD/presets/*.ffpreset $INSTALL/usr/share/ffmpeg
-  cp $PKG_BUILD/doc/ffprobe.xsd $INSTALL/usr/share/ffmpeg
diff --git a/packages/multimedia/ffmpeg/meta b/packages/multimedia/ffmpeg/meta
deleted file mode 100644
index b6d3f32e4f..0000000000
--- a/packages/multimedia/ffmpeg/meta
+++ /dev/null
@@ -1,45 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  OpenELEC is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-PKG_NAME="ffmpeg"
-PKG_VERSION="1.2.5"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="LGPL"
-PKG_SITE="http://ffmpeg.org"
-PKG_URL="http://ffmpeg.org/releases/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="zlib bzip2 libvorbis gnutls"
-PKG_BUILD_DEPENDS="toolchain yasm:host zlib bzip2 libvorbis gnutls"
-PKG_PRIORITY="optional"
-PKG_SECTION="multimedia"
-PKG_SHORTDESC="FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video."
-PKG_LONGDESC="FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video."
-
-PKG_IS_ADDON="no"
-PKG_AUTORECONF="no"
-
-if [ "$VAAPI" = yes ]; then
-  PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libva"
-  PKG_DEPENDS="$PKG_DEPENDS libva"
-fi
-
-if [ "$VDPAU" = yes ]; then
-  PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libvdpau"
-  PKG_DEPENDS="$PKG_DEPENDS libvdpau"
-fi
-
diff --git a/packages/multimedia/ffmpeg/package.mk b/packages/multimedia/ffmpeg/package.mk
new file mode 100644
index 0000000000..7dd45b2968
--- /dev/null
+++ b/packages/multimedia/ffmpeg/package.mk
@@ -0,0 +1,230 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#
+#  OpenELEC is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  OpenELEC is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="ffmpeg"
+PKG_VERSION="1.2.5"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="LGPL"
+PKG_SITE="http://ffmpeg.org"
+PKG_URL="http://ffmpeg.org/releases/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS_TARGET="zlib bzip2 libvorbis gnutls"
+PKG_BUILD_DEPENDS_TARGET="toolchain yasm:host zlib bzip2 libvorbis gnutls"
+PKG_PRIORITY="optional"
+PKG_SECTION="multimedia"
+PKG_SHORTDESC="FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video."
+PKG_LONGDESC="FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video."
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
+if [ "$VAAPI" = yes ]; then
+  PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libva"
+  PKG_DEPENDS="$PKG_DEPENDS libva"
+  FFMPEG_VAAPI="--enable-vaapi"
+else
+  FFMPEG_VAAPI="--disable-vaapi"
+fi
+
+if [ "$VDPAU" = yes ]; then
+  PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libvdpau"
+  PKG_DEPENDS="$PKG_DEPENDS libvdpau"
+  FFMPEG_VDPAU="--enable-vdpau"
+else
+  FFMPEG_VDPAU="--disable-vdpau"
+fi
+
+if [ "$DEBUG" = yes ]; then
+  FFMPEG_DEBUG="--enable-debug --disable-stripping"
+else
+  FFMPEG_DEBUG="--disable-debug --enable-stripping"
+fi
+
+if [ "$OPTIMIZATIONS" = size ]; then
+  FFMPEG_OPTIM="--disable-small"
+else
+  FFMPEG_OPTIM="--disable-small"
+fi
+
+if [ "$CRYSTALHD" = yes ]; then
+# disabled, we use XBMC's internal solution
+  FFMPEG_CRYSTALHD="--disable-crystalhd"
+else
+  FFMPEG_CRYSTALHD="--disable-crystalhd"
+fi
+
+case "$TARGET_ARCH" in
+  arm)
+      FFMPEG_CPU=""
+      FFMPEG_TABLES="--enable-hardcoded-tables"
+      FFMPEG_PIC="--enable-pic"
+  ;;
+  i?86)
+      FFMPEG_CPU=""
+      FFMPEG_TABLES="--disable-hardcoded-tables"
+      FFMPEG_PIC="--disable-pic"
+  ;;
+  x86_64)
+      FFMPEG_CPU=""
+      FFMPEG_TABLES="--disable-hardcoded-tables"
+      FFMPEG_PIC="--enable-pic"
+  ;;
+esac
+
+case "$TARGET_FPU" in
+  neon*)
+      FFMPEG_FPU="--enable-neon"
+  ;;
+  vfp*)
+      FFMPEG_FPU=""
+  ;;
+  *)
+      FFMPEG_FPU=""
+  ;;
+esac
+
+pre_configure_target() {
+  cd $ROOT/$PKG_BUILD
+  rm -rf .$TARGET_NAME
+
+  export pkg_config="$ROOT/$TOOLCHAIN/bin/pkg-config"
+
+# ffmpeg fails building with LTO support
+  strip_lto
+
+# ffmpeg fails running with GOLD support
+  strip_gold
+}
+
+configure_target() {
+  ./configure --prefix=/usr \
+              --cpu=$TARGET_CPU \
+              --arch=$TARGET_ARCH \
+              --enable-cross-compile \
+              --cross-prefix=$TARGET_PREFIX \
+              --sysroot=$SYSROOT_PREFIX \
+              --sysinclude="$SYSROOT_PREFIX/usr/include" \
+              --target-os="linux" \
+              --nm="$NM" \
+              --ar="$AR" \
+              --as="$CC" \
+              --cc="$CC" \
+              --ld="$CC" \
+              --host-cc="$HOST_CC" \
+              --host-cflags="$HOST_CFLAGS" \
+              --host-ldflags="$HOST_LDFLAGS" \
+              --host-libs="-lm" \
+              --extra-cflags="$CFLAGS" \
+              --extra-ldflags="$LDFLAGS" \
+              --extra-libs="" \
+              --extra-version="" \
+              --build-suffix="" \
+              --disable-static \
+              --enable-shared \
+              --enable-gpl \
+              --disable-version3 \
+              --disable-nonfree \
+              --enable-logging \
+              --disable-doc \
+              $FFMPEG_DEBUG \
+              $FFMPEG_PIC \
+              --enable-optimizations \
+              --disable-extra-warnings \
+              --disable-ffprobe \
+              --disable-ffplay \
+              --disable-ffserver \
+              --enable-ffmpeg \
+              --enable-avdevice \
+              --enable-avcodec \
+              --enable-avformat \
+              --enable-swscale \
+              --enable-postproc \
+              --enable-avfilter \
+              --disable-devices \
+              --enable-pthreads \
+              --disable-w32threads \
+              --disable-x11grab \
+              --enable-network \
+              --enable-gnutls \
+              --disable-gray \
+              --enable-swscale-alpha \
+              $FFMPEG_OPTIM \
+              --enable-dct \
+              --enable-fft \
+              --enable-mdct \
+              --enable-rdft \
+              $FFMPEG_CRYSTALHD \
+              $FFMPEG_VAAPI \
+              $FFMPEG_VDPAU \
+              --disable-dxva2 \
+              --enable-runtime-cpudetect \
+              $FFMPEG_TABLES \
+              --disable-memalign-hack \
+              --disable-encoders \
+              --enable-encoder=ac3 \
+              --enable-encoder=aac \
+              --disable-decoder=mpeg_xvmc \
+              --enable-hwaccels \
+              --disable-muxers \
+              --enable-muxer=spdif \
+              --enable-muxer=adts \
+              --enable-demuxers \
+              --enable-parsers \
+              --enable-bsfs \
+              --enable-protocol=http \
+              --disable-indevs \
+              --disable-outdevs \
+              --enable-filters \
+              --disable-avisynth \
+              --enable-bzlib \
+              --disable-frei0r \
+              --disable-libopencore-amrnb \
+              --disable-libopencore-amrwb \
+              --disable-libopencv \
+              --disable-libdc1394 \
+              --disable-libfaac \
+              --disable-libfreetype \
+              --disable-libgsm \
+              --disable-libmp3lame \
+              --disable-libnut \
+              --disable-libopenjpeg \
+              --disable-librtmp \
+              --disable-libschroedinger \
+              --disable-libspeex \
+              --disable-libtheora \
+              --disable-libvo-aacenc \
+              --disable-libvo-amrwbenc \
+              --enable-libvorbis --enable-muxer=ogg --enable-encoder=libvorbis \
+              --disable-libvpx \
+              --disable-libx264 \
+              --disable-libxavs \
+              --disable-libxvid \
+              --enable-zlib \
+              --enable-asm \
+              --disable-altivec \
+              $FFMPEG_CPU \
+              $FFMPEG_FPU \
+              --disable-vis \
+              --enable-yasm \
+              --disable-sram \
+              --disable-symver
+}
+
+post_makeinstall_target() {
+  rm -rf $INSTALL/usr/share/ffmpeg/examples
+}