diff --git a/packages/multimedia/libdvbcsa/package.mk b/packages/multimedia/libdvbcsa/package.mk
index a011149db2..d594e86d8e 100644
--- a/packages/multimedia/libdvbcsa/package.mk
+++ b/packages/multimedia/libdvbcsa/package.mk
@@ -17,12 +17,13 @@
 ################################################################################
 
 PKG_NAME="libdvbcsa"
-PKG_VERSION="1.1.0"
+PKG_VERSION="f988715"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://www.videolan.org/developers/libdvbcsa.html"
-PKG_URL="http://download.videolan.org/pub/videolan/libdvbcsa/${PKG_VERSION}/libdvbcsa-${PKG_VERSION}.tar.gz"
+PKG_SITE="https://github.com/glenvt18/libdvbcsa/"
+PKG_URL="$DISTRO_SRC/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="lib"
@@ -33,3 +34,16 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
 PKG_CONFIGURE_OPTS_TARGET="--disable-shared --enable-static --with-sysroot=$SYSROOT_PREFIX"
+
+if echo "$TARGET_FPU" | grep -q '^neon'; then
+  PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-neon"
+elif [ "$TARGET_ARCH" = x86_64  ]; then
+  if echo "$PROJECT_CFLAGS" | grep -q '\-mssse3'; then
+    PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-ssse3"
+  elif echo "$PROJECT_CFLAGS" | grep -q '\-msse2'; then
+    PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-sse2"
+  else
+    PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-uint64"
+  fi
+fi
+
diff --git a/tools/mkpkg/mkpkg_libdvbcsa b/tools/mkpkg/mkpkg_libdvbcsa
new file mode 100755
index 0000000000..4d8f67c0c9
--- /dev/null
+++ b/tools/mkpkg/mkpkg_libdvbcsa
@@ -0,0 +1,41 @@
+#!/bin/sh
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2016 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/>.
+################################################################################
+
+echo "getting sources..."
+  if [ ! -d libdvbcsa.git ]; then
+    git clone https://github.com/glenvt18/libdvbcsa.git --depth=1 -b master libdvbcsa.git
+  fi
+
+  cd libdvbcsa.git
+    git pull
+    GIT_REV=`git log -n1 --format=%h`
+  cd ..
+
+echo "copying sources..."
+  rm -rf libdvbcsa-$GIT_REV
+  cp -R libdvbcsa.git libdvbcsa-$GIT_REV
+
+echo "cleaning sources..."
+  rm -rf libdvbcsa-$GIT_REV/.git
+
+echo "packing sources..."
+  tar cvJf libdvbcsa-$GIT_REV.tar.xz libdvbcsa-$GIT_REV
+
+echo "remove temporary sourcedir..."
+  rm -rf libdvbcsa-$GIT_REV