diff --git a/packages/3rdparty/multimedia/vdr/build b/packages/3rdparty/multimedia/vdr/build
index fd42acac12..8e6627f485 100755
--- a/packages/3rdparty/multimedia/vdr/build
+++ b/packages/3rdparty/multimedia/vdr/build
@@ -32,6 +32,7 @@ PLUGINLIBDIR = /usr/lib/vdr
 VIDEODIR = /storage/videos
 CONFDIR = /storage/.config/vdr
 LOCDIR = /usr/share/locale
+LIBS += -lz -lexpat -lbz2 -lfontconfig -lfreetype -lxml2
 
 NO_KBD=yes
 VDR_USER=root
diff --git a/packages/3rdparty/multimedia/vdr/meta b/packages/3rdparty/multimedia/vdr/meta
index 17144bd164..48c9ddb707 100644
--- a/packages/3rdparty/multimedia/vdr/meta
+++ b/packages/3rdparty/multimedia/vdr/meta
@@ -27,7 +27,7 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://www.tvdr.de"
 PKG_URL="ftp://ftp.tvdr.de/vdr/Developer/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="fontconfig libcap"
-PKG_BUILD_DEPENDS="toolchain gettext fontconfig freetype fribidi libcap libjpeg-turbo"
+PKG_BUILD_DEPENDS="toolchain gettext fontconfig freetype fribidi libcap libjpeg-turbo bzip2 libXfont expat"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
 PKG_SHORTDESC="vdr: A powerful DVB TV application"
diff --git a/packages/3rdparty/web/tntnet/build b/packages/3rdparty/web/tntnet/build
index 4d2cda10f0..36fa0a164b 100755
--- a/packages/3rdparty/web/tntnet/build
+++ b/packages/3rdparty/web/tntnet/build
@@ -47,6 +47,8 @@ cd ..
 
 setup_toolchain target
 
+strip_lto
+
 mkdir -p .build-target && cd .build-target
 
 ../configure --host=$TARGET_NAME \
diff --git a/packages/addons/service/multimedia/vdr-addon/changelog.txt b/packages/addons/service/multimedia/vdr-addon/changelog.txt
index 37923f3aa7..5650258a67 100644
--- a/packages/addons/service/multimedia/vdr-addon/changelog.txt
+++ b/packages/addons/service/multimedia/vdr-addon/changelog.txt
@@ -1,3 +1,6 @@
+2.1.8
+- rebuild due to some static libs in latest git
+
 2.1.7
 - update to vdr-plugin-streamdev-6a47e20
 - update to vdr-sc-613
diff --git a/packages/addons/service/multimedia/vdr-addon/meta b/packages/addons/service/multimedia/vdr-addon/meta
index 0546fa359e..63ffc0c189 100644
--- a/packages/addons/service/multimedia/vdr-addon/meta
+++ b/packages/addons/service/multimedia/vdr-addon/meta
@@ -21,7 +21,7 @@
 
 PKG_NAME="vdr-addon"
 PKG_VERSION="2.1"
-PKG_REV="7"
+PKG_REV="8"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
diff --git a/packages/linux-drivers/linux-tbs-drivers/meta b/packages/linux-drivers/linux-tbs-drivers/meta
index b0954ddcb1..b904b0f18c 100644
--- a/packages/linux-drivers/linux-tbs-drivers/meta
+++ b/packages/linux-drivers/linux-tbs-drivers/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="linux-tbs-drivers"
-PKG_VERSION="120405"
+PKG_VERSION="120521"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/sysutils/busybox/config/busybox.conf b/packages/sysutils/busybox/config/busybox.conf
index ca1febb808..5e710bc056 100644
--- a/packages/sysutils/busybox/config/busybox.conf
+++ b/packages/sysutils/busybox/config/busybox.conf
@@ -103,9 +103,9 @@ CONFIG_FEATURE_EDITING=y
 CONFIG_FEATURE_EDITING_MAX_LEN=1024
 # CONFIG_FEATURE_EDITING_VI is not set
 CONFIG_FEATURE_EDITING_HISTORY=15
-# CONFIG_FEATURE_EDITING_SAVEHISTORY is not set
+CONFIG_FEATURE_EDITING_SAVEHISTORY=y
 # CONFIG_FEATURE_EDITING_SAVE_ON_EXIT is not set
-# CONFIG_FEATURE_REVERSE_SEARCH is not set
+CONFIG_FEATURE_REVERSE_SEARCH=y
 CONFIG_FEATURE_TAB_COMPLETION=y
 # CONFIG_FEATURE_USERNAME_COMPLETION is not set
 CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
diff --git a/packages/x11/lib/libfontenc/meta b/packages/x11/lib/libfontenc/meta
index 76ea2899f1..2a46572ac8 100644
--- a/packages/x11/lib/libfontenc/meta
+++ b/packages/x11/lib/libfontenc/meta
@@ -26,7 +26,7 @@ PKG_LICENSE="OSS"
 PKG_SITE="http://www.X.org"
 PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain util-macros xproto zlib"
+PKG_BUILD_DEPENDS="toolchain util-macros xproto zlib font-util"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/lib"
 PKG_SHORTDESC="libfontenc: X11 font encoding library"