diff --git a/TODO b/TODO
index 2bcacd9d1a..1e060370c4 100644
--- a/TODO
+++ b/TODO
@@ -3,8 +3,3 @@ ncurses-5.8/5.9:
 
 irserver:
   - rework irserver/init.d for systemd
-
-nettle/gmp
-  - ffmpeg shared build fails with gmp/nettle static (-fPIC?)
-    so try-build gmp/nettle as static-only libs once xbmc/ffmpeg 
-    is static linked and we drop ffmpeg package (or build it static)
diff --git a/config/path b/config/path
index 04d5fe3d22..95c5b37b31 100644
--- a/config/path
+++ b/config/path
@@ -51,7 +51,10 @@ SED="sed -i"
   PKG_LICENSE="unknown"
   PKG_SITE=""
   PKG_URL=""
-  PKG_DEPENDS=""
+  PKG_DEPENDS_TARGET=""
+  PKG_DEPENDS_HOST=""
+  PKG_DEPENDS_INIT=""
+  PKG_DEPENDS_BOOTSTRAP=""
   PKG_PRIORITY="optional"
   PKG_SECTION=""
   PKG_SHORTDESC="$1 (autogenerated)"
diff --git a/packages/addons/driver/sundtek-mediatv/changelog.txt b/packages/addons/driver/sundtek-mediatv/changelog.txt
index 9c38405ba9..b84a437bac 100644
--- a/packages/addons/driver/sundtek-mediatv/changelog.txt
+++ b/packages/addons/driver/sundtek-mediatv/changelog.txt
@@ -1,3 +1,5 @@
+4.1.4
+  enable hw pid filter by default
 4.1.3
   include driver bin/libs
 4.1.2
diff --git a/packages/addons/driver/sundtek-mediatv/package.mk b/packages/addons/driver/sundtek-mediatv/package.mk
index ce168f6c72..d868b0ad28 100644
--- a/packages/addons/driver/sundtek-mediatv/package.mk
+++ b/packages/addons/driver/sundtek-mediatv/package.mk
@@ -18,7 +18,7 @@
 
 PKG_NAME="sundtek-mediatv"
 PKG_VERSION="4.1"
-PKG_REV="3"
+PKG_REV="4"
 PKG_ARCH="any"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://support.sundtek.com/"
diff --git a/packages/addons/driver/sundtek-mediatv/settings-default.xml b/packages/addons/driver/sundtek-mediatv/settings-default.xml
index 326d7448ba..e182036226 100644
--- a/packages/addons/driver/sundtek-mediatv/settings-default.xml
+++ b/packages/addons/driver/sundtek-mediatv/settings-default.xml
@@ -1,7 +1,7 @@
 <settings>
   <setting id="SETTLE_TIME" value="0" />
   <setting id="RUN_USER_SCRIPT" value="false" />
-  <setting id="ENABLE_HW_PID_FILTER" value="false" />
+  <setting id="ENABLE_HW_PID_FILTER" value="true" />
   <setting id="ENABLE_IR_RECEIVER" value="false" />
   <setting id="LOWEST_ADAPTER_NUM" value="0" />
   <setting id="SUSPEND_DRIVER" value="true" />
diff --git a/packages/addons/driver/sundtek-mediatv/source/resources/settings.xml b/packages/addons/driver/sundtek-mediatv/source/resources/settings.xml
index b7b81a94f1..8746f30aae 100644
--- a/packages/addons/driver/sundtek-mediatv/source/resources/settings.xml
+++ b/packages/addons/driver/sundtek-mediatv/source/resources/settings.xml
@@ -4,7 +4,7 @@
     <setting type="sep" />
     <setting id="SETTLE_TIME"          type="number" label="1014" default="0" />
     <setting id="RUN_USER_SCRIPT"      type="bool"   label="1015" default="false" />
-    <setting id="ENABLE_HW_PID_FILTER" type="bool"   label="1030" default="false" />
+    <setting id="ENABLE_HW_PID_FILTER" type="bool"   label="1030" default="true" />
     <setting id="ENABLE_IR_RECEIVER"   type="bool"   label="1035" default="false" />
     <setting id="LOWEST_ADAPTER_NUM"   type="number" label="1040" default="0" />
     <setting id="SUSPEND_DRIVER"       type="bool"   label="1050" default="true" />
diff --git a/packages/mediacenter/service.openelec.settings/package.mk b/packages/mediacenter/service.openelec.settings/package.mk
index ccaaefd0f5..4cffcc3ce2 100644
--- a/packages/mediacenter/service.openelec.settings/package.mk
+++ b/packages/mediacenter/service.openelec.settings/package.mk
@@ -24,7 +24,7 @@ PKG_LICENSE="prop."
 PKG_SITE="http://www.openelec.tv"
 PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.zip"
 PKG_SOURCE_DIR="$PKG_NAME"
-PKG_DEPENDS_TARGET="toolchain Python connman"
+PKG_DEPENDS_TARGET="toolchain Python connman pygobject dbus-python"
 PKG_PRIORITY="optional"
 PKG_SECTION=""
 PKG_SHORTDESC="service.openelec.settings: Settings dialog for OpenELEC"
@@ -34,9 +34,9 @@ PKG_IS_ADDON="yes"
 PKG_AUTORECONF="no"
 
 if [ "$DISPLAYSERVER" = "x11" ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS setxkbmap"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET setxkbmap"
 else
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS bkeymaps"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET bkeymaps"
 fi
 
 make_target() {
diff --git a/packages/mediacenter/xbmc-pvr-addons/package.mk b/packages/mediacenter/xbmc-pvr-addons/package.mk
index 372be72708..894bfd0007 100644
--- a/packages/mediacenter/xbmc-pvr-addons/package.mk
+++ b/packages/mediacenter/xbmc-pvr-addons/package.mk
@@ -32,7 +32,7 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
 if [ "$MYSQL_SUPPORT" = yes ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS mysql"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET mysql"
   PVRADDONS_MYSQL="--enable-mysql"
 else
   PVRADDONS_MYSQL="--disable-mysql"
diff --git a/packages/multimedia/libbluray/package.mk b/packages/multimedia/libbluray/package.mk
index de37bfa12d..17308f865f 100644
--- a/packages/multimedia/libbluray/package.mk
+++ b/packages/multimedia/libbluray/package.mk
@@ -33,7 +33,7 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
 if [ "$NONFREE_SUPPORT" = "yes" ]; then
-  PKG_DEPENDS="$PKG_DEPENDS libaacs"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libaacs"
 fi
 
 PKG_CONFIGURE_OPTS_TARGET="--disable-werror \
diff --git a/packages/network/bluez/package.mk b/packages/network/bluez/package.mk
index 6b7ee1e7d4..03d2e1f7f9 100644
--- a/packages/network/bluez/package.mk
+++ b/packages/network/bluez/package.mk
@@ -68,6 +68,8 @@ pre_configure_target() {
 
 post_makeinstall_target() {
   rm -rf $INSTALL/lib/systemd
+  rm -rf $INSTALL/usr/bin/bccmd
+  rm -rf $INSTALL/usr/bin/bluemoon
   rm -rf $INSTALL/usr/bin/ciptool
 }
 
diff --git a/packages/network/connman/package.mk b/packages/network/connman/package.mk
index a276245bc7..1c0363f046 100644
--- a/packages/network/connman/package.mk
+++ b/packages/network/connman/package.mk
@@ -24,7 +24,7 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://www.connman.net"
 PKG_URL="http://www.kernel.org/pub/linux/network/connman/$PKG_NAME-$PKG_VERSION.tar.xz"
 # PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS_TARGET="toolchain glib readline dbus iptables wpa_supplicant ntp Python pygobject dbus-python"
+PKG_DEPENDS_TARGET="toolchain glib readline dbus iptables wpa_supplicant ntp"
 PKG_PRIORITY="optional"
 PKG_SECTION="network"
 PKG_SHORTDESC="connman: Network manager daemon"
diff --git a/packages/security/nettle/patches/nettle-01_dont-build-subdirs.patch b/packages/security/nettle/patches/nettle-01_dont-build-subdirs.patch
new file mode 100644
index 0000000000..b5fe9ff02d
--- /dev/null
+++ b/packages/security/nettle/patches/nettle-01_dont-build-subdirs.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.in b/Makefile.in
+index 2c25007..7980fa8 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -16,7 +16,7 @@ MKDIR_P = @MKDIR_P@
+ 
+ OPT_ASM_SOURCES = @OPT_ASM_SOURCES@
+ 
+-SUBDIRS = tools testsuite examples
++SUBDIRS = 
+ 
+ include config.make
+ 
diff --git a/packages/sysutils/e2fsprogs/package.mk b/packages/sysutils/e2fsprogs/package.mk
index 25853cd06a..949d8bd4bb 100644
--- a/packages/sysutils/e2fsprogs/package.mk
+++ b/packages/sysutils/e2fsprogs/package.mk
@@ -33,7 +33,7 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
 if [ "$HFSTOOLS" = "yes" ]; then
-  PKG_DEPENDS="$PKG_DEPENDS diskdev_cmds"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET diskdev_cmds"
 fi
 
 PKG_CONFIGURE_OPTS_TARGET="--prefix=/usr \
diff --git a/packages/sysutils/lcdproc/package.mk b/packages/sysutils/lcdproc/package.mk
index 8495712c3d..82848671a2 100644
--- a/packages/sysutils/lcdproc/package.mk
+++ b/packages/sysutils/lcdproc/package.mk
@@ -33,7 +33,7 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
 if [ "$IRSERVER_SUPPORT" = yes ]; then
-  PKG_DEPENDS="$PKG_DEPENDS irserver"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET irserver"
 fi
 
 PKG_CONFIGURE_OPTS_TARGET="--enable-libusb --enable-drivers=$LCD_DRIVER,!curses,!svga --enable-seamless-hbars"
diff --git a/packages/sysutils/pciutils/package.mk b/packages/sysutils/pciutils/package.mk
index 1d146d6380..e28cf2b5cc 100644
--- a/packages/sysutils/pciutils/package.mk
+++ b/packages/sysutils/pciutils/package.mk
@@ -61,6 +61,7 @@ post_makeinstall_target() {
   rm -rf $INSTALL/usr/bin/setpci
   rm -rf $INSTALL/usr/bin/update-pciids
   rm -rf $INSTALL/usr/share
+  rm -rf $INSTALL/usr/sbin/update-pciids
 
   mkdir -p $INSTALL/usr/share
     cp $PKG_DIR/config/pci.ids $INSTALL/usr/share
diff --git a/packages/tools/installer/package.mk b/packages/tools/installer/package.mk
index 5646a1bc18..38ca22ee6d 100644
--- a/packages/tools/installer/package.mk
+++ b/packages/tools/installer/package.mk
@@ -33,7 +33,7 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
 if [ "$TARGET_ARCH" = "i386" -o "$TARGET_ARCH" = "x86_64" ]; then
-  PKG_DEPENDS="$PKG_DEPENDS flashrom"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET flashrom"
 fi
 
 make_target() {
diff --git a/scripts/install b/scripts/install
index e148aba780..87a2027f1b 100755
--- a/scripts/install
+++ b/scripts/install
@@ -63,11 +63,11 @@ printf "%${BUILD_INDENT}c ${boldgreen}INSTALL${endcolor}    $PACKAGE_NAME ${bold
 export BUILD_INDENT=$((${BUILD_INDENT:-1}+$BUILD_INDENT_SIZE))
 
 if [ "$TARGET" = target ] ; then
-  for p in $PKG_DEPENDS $PKG_DEPENDS_TARGET; do
+  for p in $PKG_DEPENDS_TARGET; do
     $SCRIPTS/install $p
   done
 elif [ "$TARGET" = init ] ; then
-  for p in $PKG_DEPENDS $PKG_DEPENDS_INIT; do
+  for p in $PKG_DEPENDS_INIT; do
     $SCRIPTS/install $p
   done
   INSTALL=$BUILD/initramfs