diff --git a/distributions/OpenELEC/options b/distributions/OpenELEC/options
index 1b8ea39df4..88c9cab266 100644
--- a/distributions/OpenELEC/options
+++ b/distributions/OpenELEC/options
@@ -14,6 +14,9 @@
 # Root password to integrate in the target system
   ROOT_PASSWORD="openelec"
 
+# Install glibc locales to the build (yes / no)
+  GLIBC_LOCALES="yes"
+
 # Mediacenter to use (kodi / no)
   MEDIACENTER="kodi"
 
diff --git a/packages/devel/glibc/package.mk b/packages/devel/glibc/package.mk
index ad35377400..dff6190b11 100644
--- a/packages/devel/glibc/package.mk
+++ b/packages/devel/glibc/package.mk
@@ -139,10 +139,13 @@ post_makeinstall_target() {
 
 # remove locales and charmaps
   rm -rf $INSTALL/usr/share/i18n/charmaps
-  rm -rf $INSTALL/usr/share/i18n/locales
 
-  mkdir -p $INSTALL/usr/share/i18n/locales
-    cp -PR $ROOT/$PKG_BUILD/localedata/locales/POSIX $INSTALL/usr/share/i18n/locales
+  if [ ! "$GLIBC_LOCALES" = yes ]; then
+    rm -rf $INSTALL/usr/share/i18n/locales
+
+    mkdir -p $INSTALL/usr/share/i18n/locales
+      cp -PR $ROOT/$PKG_BUILD/localedata/locales/POSIX $INSTALL/usr/share/i18n/locales
+  fi
 
 # create default configs
   mkdir -p $INSTALL/etc
diff --git a/packages/linux/config/initramfs b/packages/linux/config/initramfs
deleted file mode 100644
index 4b4c54b56a..0000000000
--- a/packages/linux/config/initramfs
+++ /dev/null
@@ -1,19 +0,0 @@
-dir /dev 755 0 0
-
-dir /bin 755 1000 1000
-slink /bin/sh busybox 777 0 0
-file /bin/busybox initramfs/bin/busybox 4755 0 0
-
-dir /sbin 755 1000 1000
-file /sbin/ply-image initramfs/sbin/ply-image 755 0 0
-
-dir /splash 755 1000 1000
-file /splash/splash.png initramfs/splash/splash.png 644 0 0
-
-dir /proc 755 0 0
-dir /sys 755 0 0
-dir /flash 755 0 0
-dir /sysroot 755 0 0
-dir /storage 755 0 0
-
-file /init initramfs/init 755 0 0
diff --git a/packages/network/iptables/package.mk b/packages/network/iptables/package.mk
index 78cd0ff164..157239048f 100644
--- a/packages/network/iptables/package.mk
+++ b/packages/network/iptables/package.mk
@@ -32,4 +32,4 @@ PKG_LONGDESC="Iptables is used to set up, maintain, and inspect the tables of IP
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
-PKG_CONFIGURE_OPTS_TARGET="--with-kernel=$(kernel_path)"
+PKG_CONFIGURE_OPTS_TARGET="--with-kernel=$(kernel_path) --enable-static --disable-shared"
diff --git a/packages/sysutils/systemd/package.mk b/packages/sysutils/systemd/package.mk
index 88c615bc00..71ab66e97f 100644
--- a/packages/sysutils/systemd/package.mk
+++ b/packages/sysutils/systemd/package.mk
@@ -23,7 +23,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.freedesktop.org/wiki/Software/systemd"
 PKG_URL="http://www.freedesktop.org/software/systemd/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS_TARGET="toolchain libcap kmod util-linux libgcrypt"
+PKG_DEPENDS_TARGET="toolchain libcap kmod util-linux"
 PKG_PRIORITY="required"
 PKG_SECTION="system"
 PKG_SHORTDESC="systemd: a system and session manager"
diff --git a/packages/web/libmicrohttpd/package.mk b/packages/web/libmicrohttpd/package.mk
index 612d1d91bc..21a6afb8fb 100644
--- a/packages/web/libmicrohttpd/package.mk
+++ b/packages/web/libmicrohttpd/package.mk
@@ -13,7 +13,7 @@
 #  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/>.
+#  along with OpenELEC.  If not, see http://www.gnu.org/licenses/>.
 ################################################################################
 
 PKG_NAME="libmicrohttpd"
@@ -23,7 +23,7 @@ PKG_ARCH="any"
 PKG_LICENSE="LGPLv2.1"
 PKG_SITE="https://www.gnu.org/software/libmicrohttpd/"
 PKG_URL="https://ftp.gnu.org/gnu/libmicrohttpd/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS_TARGET="toolchain libgcrypt"
+PKG_DEPENDS_TARGET="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="web"
 PKG_SHORTDESC="libmicrohttpd: a small webserver C library"
@@ -35,8 +35,7 @@ PKG_AUTORECONF="yes"
 PKG_CONFIGURE_OPTS_TARGET="--disable-shared \
                            --enable-static \
                            --disable-curl \
-                           --disable-https \
-                           --with-libgcrypt-prefix=$SYSROOT_PREFIX/usr"
+                           --disable-https"
 
 post_makeinstall_target() {
   rm -rf $INSTALL/usr/bin
diff --git a/packages/x11/app/setxkbmap/package.mk b/packages/x11/app/setxkbmap/package.mk
index bd3751319b..7dde582190 100644
--- a/packages/x11/app/setxkbmap/package.mk
+++ b/packages/x11/app/setxkbmap/package.mk
@@ -23,7 +23,7 @@ PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.X.org"
 PKG_URL="http://xorg.freedesktop.org/archive/individual/app/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS_TARGET="toolchain libX11"
+PKG_DEPENDS_TARGET="toolchain libX11 libxkbfile"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/app"
 PKG_SHORTDESC="setxkbmap: Sets the keyboard using the X Keyboard Extension"
diff --git a/tools/mkpkg/mkpkg_libepoxy b/tools/mkpkg/mkpkg_libepoxy
deleted file mode 100755
index b521c86d98..0000000000
--- a/tools/mkpkg/mkpkg_libepoxy
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program 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, or (at your option)
-#  any later version.
-#
-#  This Program 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.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d libepoxy.git ]; then
-    git clone https://github.com/anholt/libepoxy.git -b master libepoxy.git
-  fi
-
-  cd libepoxy.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf libepoxy-$GIT_REV
-  cp -R libepoxy.git libepoxy-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf libepoxy-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf libepoxy-$GIT_REV.tar.xz libepoxy-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf libepoxy-$GIT_REV