diff --git a/packages/addons/debugging/tools/evtest/addon b/packages/addons/debugging/tools/evtest/addon
index 722f2d20da..226c0a05c1 100755
--- a/packages/addons/debugging/tools/evtest/addon
+++ b/packages/addons/debugging/tools/evtest/addon
@@ -25,11 +25,3 @@
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
   cp $PKG_BUILD/evtest $ADDON_BUILD/$PKG_ADDON_ID/bin/evtest.bin
   cp $PKG_BUILD/evtest-capture $ADDON_BUILD/$PKG_ADDON_ID/bin/evtest-capture.bin
-
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
-  cp -P $BUILD/libxml2-[0-9]*/.build-target/.libs/libxml2.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
-  cp -P $BUILD/zlib-[0-9]*/libz.so.* $ADDON_BUILD/$PKG_ADDON_ID/lib
-
-  if [ "$ICONV" = "libiconv" ]; then
-    cp -P $BUILD/libiconv-[0-9]*/lib/.libs/libiconv.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
-  fi
diff --git a/packages/addons/debugging/tools/evtest/changelog.txt b/packages/addons/debugging/tools/evtest/changelog.txt
index d6e3cb078e..c8cf3e3fd2 100644
--- a/packages/addons/debugging/tools/evtest/changelog.txt
+++ b/packages/addons/debugging/tools/evtest/changelog.txt
@@ -1,3 +1,6 @@
+2.1.2
+- cleanup
+
 2.1.1
 - rebuild for addon version 2.1
 
diff --git a/packages/addons/debugging/tools/evtest/meta b/packages/addons/debugging/tools/evtest/meta
index 8daf130de1..a45c1932c6 100644
--- a/packages/addons/debugging/tools/evtest/meta
+++ b/packages/addons/debugging/tools/evtest/meta
@@ -20,7 +20,7 @@
 
 PKG_NAME="evtest"
 PKG_VERSION="1.29"
-PKG_REV="1"
+PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://cgit.freedesktop.org/evtest/"
diff --git a/packages/addons/debugging/tools/htop/addon b/packages/addons/debugging/tools/htop/addon
index 7178d7a735..5585786245 100755
--- a/packages/addons/debugging/tools/htop/addon
+++ b/packages/addons/debugging/tools/htop/addon
@@ -23,8 +23,4 @@
 . config/options $1
 
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp $PKG_BUILD/htop $ADDON_BUILD/$PKG_ADDON_ID/bin/htop.bin
-
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
-  cp $BUILD/ncurses-[0-9]*/lib/libtinfo.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
-  cp $BUILD/ncurses-[0-9]*/lib/libncurses.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
+  cp $PKG_BUILD/htop $ADDON_BUILD/$PKG_ADDON_ID/bin
diff --git a/packages/addons/debugging/tools/htop/changelog.txt b/packages/addons/debugging/tools/htop/changelog.txt
index c43af68d06..6daa9a9e31 100644
--- a/packages/addons/debugging/tools/htop/changelog.txt
+++ b/packages/addons/debugging/tools/htop/changelog.txt
@@ -1,3 +1,6 @@
+2.1.2
+- cleanup
+
 2.1.1
 - rebuild for addon version 2.1
 - update to htop-1.0.1
diff --git a/packages/addons/debugging/tools/htop/meta b/packages/addons/debugging/tools/htop/meta
index 725914772f..eba4a74a00 100644
--- a/packages/addons/debugging/tools/htop/meta
+++ b/packages/addons/debugging/tools/htop/meta
@@ -20,7 +20,7 @@
 
 PKG_NAME="htop"
 PKG_VERSION="1.0.1"
-PKG_REV="1"
+PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://htop.sourceforge.net/"
diff --git a/packages/addons/debugging/tools/htop/source/bin/htop b/packages/addons/debugging/tools/htop/source/bin/htop
deleted file mode 100755
index 47eebfa154..0000000000
--- a/packages/addons/debugging/tools/htop/source/bin/htop
+++ /dev/null
@@ -1,27 +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
-################################################################################
-
-. /etc/profile
-
-ADDON_DIR="$HOME/.xbmc/addons/debug.tools.htop"
-
-LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH" htop.bin $@
diff --git a/packages/addons/networking/backup/lsyncd/addon b/packages/addons/networking/backup/lsyncd/addon
deleted file mode 100755
index eaca67ce1d..0000000000
--- a/packages/addons/networking/backup/lsyncd/addon
+++ /dev/null
@@ -1,27 +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
-################################################################################
-
-. config/options $1
-
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp $PKG_BUILD/lsyncd $ADDON_BUILD/$PKG_ADDON_ID/bin
-  chmod +x $ADDON_BUILD/$PKG_ADDON_ID/bin/lsyncd
diff --git a/packages/addons/networking/backup/lsyncd/build b/packages/addons/networking/backup/lsyncd/build
deleted file mode 100755
index 361eaae3c9..0000000000
--- a/packages/addons/networking/backup/lsyncd/build
+++ /dev/null
@@ -1,37 +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
-################################################################################
-
-. config/options $1
-
-export LUA_LIBS="$SYSROOT_PREFIX/usr/lib/liblua.a"
-export LUA_CFLAGS="-I$SYSROOT_PREFIX/usr/include"
-export LDFLAGS="-lm"
-
-cd $PKG_BUILD
-sed -i 's/\/usr\/bin\/rsync/\/storage\/.xbmc\/addons\/network.backup.rsync\/bin\/rsync/' lsyncd.lua
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --sysconfdir=/etc \
-            --localstatedir=/var \
-
-make
diff --git a/packages/addons/networking/backup/lsyncd/changelog.txt b/packages/addons/networking/backup/lsyncd/changelog.txt
deleted file mode 100644
index 1875de922a..0000000000
--- a/packages/addons/networking/backup/lsyncd/changelog.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-2.1.1
-- update to addon version 2.1
-- update to lsyncd-2.0.6
-
-2.0.1:
-- rebuild for libiconv changes
-
-2.0.0:
-- initial addon based on lsyncd-2.0.5
-
diff --git a/packages/addons/networking/backup/lsyncd/icon/icon.png b/packages/addons/networking/backup/lsyncd/icon/icon.png
deleted file mode 100644
index 81378e60d1..0000000000
Binary files a/packages/addons/networking/backup/lsyncd/icon/icon.png and /dev/null differ
diff --git a/packages/addons/networking/backup/lsyncd/meta b/packages/addons/networking/backup/lsyncd/meta
deleted file mode 100644
index 264812780e..0000000000
--- a/packages/addons/networking/backup/lsyncd/meta
+++ /dev/null
@@ -1,38 +0,0 @@
-################################################################################
-#      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
-################################################################################
-
-PKG_NAME="lsyncd"
-PKG_VERSION="2.0.6"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="http://code.google.com/p/lsyncd/"
-PKG_URL="http://lsyncd.googlecode.com/files/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain $ICONV lua"
-PKG_PRIORITY="optional"
-PKG_SECTION="network/backup"
-PKG_SHORTDESC="Lsyncd (Live Syncing Daemon) synchronizes local directories with a remote targets"
-PKG_LONGDESC="Lsyncd watches a local directory trees event monitor interface (inotify). It aggregates and combines events for a few seconds and then spawns one (or more) process(es) to synchronize the changes. By default this is rsync. Lsyncd is thus a light-weight live mirror solution that is comparatively easy to install not requiring new filesystems or blockdevices and does not hamper local filesystem performance."
-
-PKG_IS_ADDON="yes"
-PKG_ADDON_TYPE="xbmc.python.script"
-
-PKG_AUTORECONF="yes"
diff --git a/packages/addons/networking/backup/lsyncd/source/default.py b/packages/addons/networking/backup/lsyncd/source/default.py
deleted file mode 100644
index 8d4c5e9e96..0000000000
--- a/packages/addons/networking/backup/lsyncd/source/default.py
+++ /dev/null
@@ -1,23 +0,0 @@
-################################################################################
-#      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
-################################################################################
-
-import os
-import sys
-import xbmcaddon
diff --git a/packages/addons/shell/texteditor/nano/addon b/packages/addons/shell/texteditor/nano/addon
index 571b8cd7bd..0a5f1fc693 100755
--- a/packages/addons/shell/texteditor/nano/addon
+++ b/packages/addons/shell/texteditor/nano/addon
@@ -23,8 +23,4 @@
 . config/options $1
 
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp $PKG_BUILD/src/nano $ADDON_BUILD/$PKG_ADDON_ID/bin/nano.bin
-
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
-  cp $BUILD/ncurses-[0-9]*/lib/libtinfo.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
-  cp $BUILD/ncurses-[0-9]*/lib/libncurses.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
+  cp $PKG_BUILD/src/nano $ADDON_BUILD/$PKG_ADDON_ID/bin
diff --git a/packages/addons/shell/texteditor/nano/changelog.txt b/packages/addons/shell/texteditor/nano/changelog.txt
index 36cedfc4d2..6be1621073 100644
--- a/packages/addons/shell/texteditor/nano/changelog.txt
+++ b/packages/addons/shell/texteditor/nano/changelog.txt
@@ -1,3 +1,6 @@
+2.1.2
+- cleanup
+
 2.1.1
 - update to addon version 2.1
 
diff --git a/packages/addons/shell/texteditor/nano/meta b/packages/addons/shell/texteditor/nano/meta
index 31f406ae76..cb01e9fd68 100644
--- a/packages/addons/shell/texteditor/nano/meta
+++ b/packages/addons/shell/texteditor/nano/meta
@@ -20,7 +20,7 @@
 
 PKG_NAME="nano"
 PKG_VERSION="2.3.1"
-PKG_REV="1"
+PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.nano-editor.org/"
diff --git a/packages/addons/shell/texteditor/nano/source/bin/nano b/packages/addons/shell/texteditor/nano/source/bin/nano
deleted file mode 100755
index 8d765a0962..0000000000
--- a/packages/addons/shell/texteditor/nano/source/bin/nano
+++ /dev/null
@@ -1,27 +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
-################################################################################
-
-. /etc/profile
-
-ADDON_DIR="$HOME/.xbmc/addons/shell.texteditor.nano"
-
-LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH" nano.bin $@
diff --git a/packages/network/connman/init.d/21_network b/packages/network/connman/init.d/21_network
index 8d445367d0..14bd91c8f0 100644
--- a/packages/network/connman/init.d/21_network
+++ b/packages/network/connman/init.d/21_network
@@ -189,6 +189,16 @@ fi
     [ -f "$DEBUG_CONNMAN_PROFILE" ] && cp $DEBUG_CONNMAN_PROFILE $CONNMAN_PROFILE
     [ -f "$DEBUG_CONNMAN_PROFILE" ] && mv $DEBUG_CONNMAN_PROFILE ${DEBUG_CONNMAN_PROFILE}_saved
 
+  # set hwclock
+  if [ -f /proc/driver/rtc ]; then
+    (
+    # sleep 30 seconds before hw clock is synced
+    usleep 30000000
+    progress "syncing hardware clock with system clock"
+    /sbin/hwclock --systohc
+    )&
+  fi
+  
   # starting Connection manager
     progress "starting Connection manager"