diff --git a/config/path b/config/path
index f992b30df0..ee47dfc575 100644
--- a/config/path
+++ b/config/path
@@ -59,7 +59,7 @@ SED="sed -i"
   [ -n "$1" ] && PKG_DIR=`find $PACKAGES -type d -name $1 2>/dev/null`
 
   [ -r $PKG_DIR/meta ] && . $PKG_DIR/meta
-  [ "$PKG_IS_ADDON" = "yes" ] && PKG_ADDON_ID="addon.$PKG_SECTION.$PKG_NAME"
+  [ "$PKG_IS_ADDON" = "yes" ] && PKG_ADDON_ID="`echo $PKG_SECTION | sed 's,/,.,g'`.$PKG_NAME"
 
   [ -d $BUILD/${PKG_NAME}[-_.]${PKG_VERSION} ] && PKG_BUILD=`ls -d $BUILD/${PKG_NAME}[-_.]${PKG_VERSION}`
   [ -d $BUILD/${PKG_NAME}${PKG_VERSION} ] && PKG_BUILD=`ls -d $BUILD/${PKG_NAME}${PKG_VERSION}`
diff --git a/packages/addons/debugging/tools/evtest/addon b/packages/addons/debugging/tools/evtest/addon
new file mode 100755
index 0000000000..62520bc825
--- /dev/null
+++ b/packages/addons/debugging/tools/evtest/addon
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp $PKG_BUILD/evtest $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp $PKG_BUILD/evtest-capture $ADDON_BUILD/$PKG_ADDON_ID/bin
diff --git a/packages/tools/evtest/build b/packages/addons/debugging/tools/evtest/build
similarity index 93%
rename from packages/tools/evtest/build
rename to packages/addons/debugging/tools/evtest/build
index 5559e24e5b..d93dcff91b 100755
--- a/packages/tools/evtest/build
+++ b/packages/addons/debugging/tools/evtest/build
@@ -22,9 +22,12 @@
 
 . config/options $1
 
+LDFLAGS="$LDFLAGS -static"
+CFLAGS="$CFLAGS -pthread"
+
 cd $PKG_BUILD
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
             --prefix=/usr \
 
-make
+make LIBS="-lm -lz -liconv"
diff --git a/packages/addons/debugging/tools/evtest/changelog.txt b/packages/addons/debugging/tools/evtest/changelog.txt
new file mode 100644
index 0000000000..365ebdd2e2
--- /dev/null
+++ b/packages/addons/debugging/tools/evtest/changelog.txt
@@ -0,0 +1,2 @@
+0.99.1
+- initial addon based on evtest-1.27
diff --git a/packages/addons/debugging/tools/evtest/icon/icon.png b/packages/addons/debugging/tools/evtest/icon/icon.png
new file mode 100644
index 0000000000..c1cc6c21a3
Binary files /dev/null and b/packages/addons/debugging/tools/evtest/icon/icon.png differ
diff --git a/packages/tools/evtest/meta b/packages/addons/debugging/tools/evtest/meta
similarity index 94%
rename from packages/tools/evtest/meta
rename to packages/addons/debugging/tools/evtest/meta
index fcee5b0945..ce5e1dc402 100644
--- a/packages/tools/evtest/meta
+++ b/packages/addons/debugging/tools/evtest/meta
@@ -28,9 +28,11 @@ PKG_URL="http://cgit.freedesktop.org/evtest/snapshot/$PKG_NAME-$PKG_VERSION.tar.
 PKG_DEPENDS="libxml2"
 PKG_BUILD_DEPENDS="toolchain libxml2"
 PKG_PRIORITY="optional"
-PKG_SECTION="tools"
+PKG_SECTION="debug/tools"
 PKG_SHORTDESC="evtest: Simple tool for input event debugging."
 PKG_LONGDESC="evtest is a simple tool for input event debugging."
-PKG_IS_ADDON="no"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.python.script"
 
 PKG_AUTORECONF="yes"
diff --git a/packages/addons/debugging/tools/evtest/source/default.py b/packages/addons/debugging/tools/evtest/source/default.py
new file mode 100644
index 0000000000..2085a1f96d
--- /dev/null
+++ b/packages/addons/debugging/tools/evtest/source/default.py
@@ -0,0 +1,23 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+import os
+import sys
+import xbmcaddon
diff --git a/packages/tools/htop/install b/packages/addons/debugging/tools/htop/addon
similarity index 92%
rename from packages/tools/htop/install
rename to packages/addons/debugging/tools/htop/addon
index 3fc9351243..7c8c3526b8 100755
--- a/packages/tools/htop/install
+++ b/packages/addons/debugging/tools/htop/addon
@@ -22,5 +22,5 @@
 
 . config/options $1
 
-mkdir -p $INSTALL/usr/bin
-  cp $PKG_BUILD/htop $INSTALL/usr/bin
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp $PKG_BUILD/htop $ADDON_BUILD/$PKG_ADDON_ID/bin
diff --git a/packages/tools/htop/build b/packages/addons/debugging/tools/htop/build
similarity index 95%
rename from packages/tools/htop/build
rename to packages/addons/debugging/tools/htop/build
index 60dac122c4..477d01ea61 100755
--- a/packages/tools/htop/build
+++ b/packages/addons/debugging/tools/htop/build
@@ -33,7 +33,6 @@ ac_cv_func_realloc_0_nonnull=yes \
             --prefix=/usr \
             --sysconfdir=/etc \
             --localstatedir=/var \
-            --disable-static \
-            --enable-shared \
+            --with-gnu-ld
 
 make
diff --git a/packages/addons/debugging/tools/htop/changelog.txt b/packages/addons/debugging/tools/htop/changelog.txt
new file mode 100644
index 0000000000..95e36cef53
--- /dev/null
+++ b/packages/addons/debugging/tools/htop/changelog.txt
@@ -0,0 +1,5 @@
+0.99.2
+- prepare for release
+
+0.99.1
+- initial addon based on htop-0.9
diff --git a/packages/addons/debugging/tools/htop/icon/icon.png b/packages/addons/debugging/tools/htop/icon/icon.png
new file mode 100644
index 0000000000..c1cc6c21a3
Binary files /dev/null and b/packages/addons/debugging/tools/htop/icon/icon.png differ
diff --git a/packages/tools/htop/meta b/packages/addons/debugging/tools/htop/meta
similarity index 94%
rename from packages/tools/htop/meta
rename to packages/addons/debugging/tools/htop/meta
index 46eb0fe9ec..778da7ec74 100644
--- a/packages/tools/htop/meta
+++ b/packages/addons/debugging/tools/htop/meta
@@ -20,7 +20,7 @@
 
 PKG_NAME="htop"
 PKG_VERSION="0.9"
-PKG_REV="1"
+PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://htop.sourceforge.net/"
@@ -28,9 +28,11 @@ PKG_URL="$SOURCEFORGE_SRC/$PKG_NAME/$PKG_NAME/$PKG_VERSION/$PKG_NAME-$PKG_VERSIO
 PKG_DEPENDS="ncurses"
 PKG_BUILD_DEPENDS="toolchain ncurses"
 PKG_PRIORITY="optional"
-PKG_SECTION="tools"
+PKG_SECTION="debug/tools"
 PKG_SHORTDESC="htop: Htop is an ncurses based interactive process viewer for Linux."
 PKG_LONGDESC="Htop is an ncurses based interactive process viewer for Linux."
-PKG_IS_ADDON="no"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.python.script"
 
 PKG_AUTORECONF="yes"
diff --git a/packages/tools/htop/patches/htop-0.9-crosscompiling-0.1.patch b/packages/addons/debugging/tools/htop/patches/htop-0.9-crosscompiling-0.1.patch
similarity index 100%
rename from packages/tools/htop/patches/htop-0.9-crosscompiling-0.1.patch
rename to packages/addons/debugging/tools/htop/patches/htop-0.9-crosscompiling-0.1.patch
diff --git a/packages/addons/debugging/tools/htop/source/default.py b/packages/addons/debugging/tools/htop/source/default.py
new file mode 100644
index 0000000000..2085a1f96d
--- /dev/null
+++ b/packages/addons/debugging/tools/htop/source/default.py
@@ -0,0 +1,23 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+import os
+import sys
+import xbmcaddon
diff --git a/packages/addons/downloadmanager/transmission/changelog.txt b/packages/addons/downloadmanager/transmission/changelog.txt
deleted file mode 100644
index a0a9d4eea0..0000000000
--- a/packages/addons/downloadmanager/transmission/changelog.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-0.99.2
-- update to transmission-2.31
-
-0.99.1
-- initial version transmission-2.20
\ No newline at end of file
diff --git a/packages/addons/downloadmanager/transmission/source/default.py b/packages/addons/downloadmanager/transmission/source/default.py
deleted file mode 100644
index 1acdc284b2..0000000000
--- a/packages/addons/downloadmanager/transmission/source/default.py
+++ /dev/null
@@ -1,37 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-import xbmc, time, os, subprocess
-
-dir = os.path.realpath(os.path.dirname(__file__))
-script = 'start.sh'
-
-launcher = os.path.join(dir, script)
-app = '/storage/.xbmc/addons/addon.downloadmanager.transmission/bin/transmission-daemon'
-
-os.chmod(launcher, 0755)
-os.chmod(app, 0755)
-
-args = [launcher, str(os.getpid()), app]
-
-p = subprocess.Popen(args)
-print p.pid
-p.wait()
-os.exit(1)
diff --git a/packages/addons/multimedia/libav/addon b/packages/addons/multimedia/libav/addon
new file mode 100755
index 0000000000..a5207a1972
--- /dev/null
+++ b/packages/addons/multimedia/libav/addon
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp $PKG_BUILD/ffmpeg $ADDON_BUILD/$PKG_ADDON_ID/bin
+
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ffmpeg
+  cp $PKG_BUILD/ffpresets/* $ADDON_BUILD/$PKG_ADDON_ID/ffmpeg
diff --git a/packages/addons/multimedia/libav/build b/packages/addons/multimedia/libav/build
new file mode 100755
index 0000000000..ec0c03a928
--- /dev/null
+++ b/packages/addons/multimedia/libav/build
@@ -0,0 +1,165 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+# libav fails building with LTO support
+  strip_lto
+
+if [ "$VDPAU" = yes ]; then
+  FFMPEG_VDPAU="--enable-vdpau"
+else
+  FFMPEG_VDPAU="--disable-vdpau"
+fi
+
+if [ "$VAAPI" = yes ]; then
+  FFMPEG_VAAPI="--enable-vaapi"
+else
+  FFMPEG_VAAPI="--disable-vaapi"
+fi
+
+cd $PKG_BUILD/
+./configure --prefix=/storage/.xbmc/addons/lib.multimedia.$1 \
+            --datadir=/storage/.xbmc/addons/lib.multimedia.$1/ffmpeg \
+            --cpu=$TARGET_CPU \
+            --arch=$TARGET_ARCH \
+            --enable-cross-compile \
+            --cross-prefix=$TARGET_PREFIX \
+            --sysroot=$SYSROOT_PREFIX \
+            --sysinclude="$SYSROOT_PREFIX/usr/include" \
+            --target-os="linux" \
+            --nm="$NM" \
+            --ar="$AR" \
+            --as="$CC" \
+            --cc="$CC" \
+            --ld="$CC" \
+            --host-cc="$HOST_CC" \
+            --host-cflags="$HOST_CFLAGS" \
+            --host-ldflags="$HOST_LDFLAGS" \
+            --host-libs="" \
+            --extra-cflags="$CFLAGS" \
+            --extra-ldflags="$LDFLAGS" \
+            --extra-libs="" \
+            --extra-version="" \
+            --build-suffix="" \
+            --enable-static \
+            --disable-shared \
+            --enable-gpl \
+            --disable-version3 \
+            --disable-nonfree \
+            --enable-logging \
+            --enable-doc \
+            --enable-ffmpeg \
+            --disable-ffplay \
+            --disable-ffprobe \
+            --disable-ffserver \
+            --enable-avdevice \
+            --enable-avcodec \
+            --enable-avformat \
+            --enable-swscale \
+            --enable-postproc \
+            --enable-avfilter \
+            --enable-pthreads \
+            --disable-w32threads \
+            --disable-x11grab \
+            --enable-network \
+            --disable-gray \
+            --enable-swscale-alpha \
+            --enable-fastdiv \
+            --enable-small \
+            --enable-aandct \
+            --enable-dct \
+            --enable-fft \
+            --enable-golomb \
+            --enable-huffman \
+            --enable-lpc \
+            --enable-mdct \
+            --enable-rdft \
+            $FFMPEG_VAAPI \
+            $FFMPEG_VDPAU \
+            --disable-dxva2 \
+            --enable-runtime-cpudetect \
+            --disable-hardcoded-tables \
+            --disable-memalign-hack \
+            --enable-encoders \
+            --enable-decoders \
+            --enable-hwaccels \
+            --enable-muxers \
+            --enable-demuxers \
+            --enable-parsers \
+            --enable-bsfs \
+            --enable-protocols \
+            --enable-indevs \
+            --enable-outdevs \
+            --enable-filters \
+            --disable-avisynth \
+            --enable-bzlib \
+            --disable-frei0r \
+            --disable-libopencore-amrnb \
+            --disable-libopencore-amrwb \
+            --disable-libopencv \
+            --disable-libdc1394 \
+            --disable-libdirac \
+            --disable-libfaac \
+            --disable-libfreetype \
+            --disable-libgsm \
+            --disable-libmp3lame \
+            --disable-libnut \
+            --disable-libopenjpeg \
+              --disable-librtmp \
+            --disable-libschroedinger \
+            --disable-libspeex \
+            --disable-libtheora \
+            --disable-libvo-aacenc \
+            --disable-libvo-amrwbenc \
+            --disable-libvorbis \
+            --disable-libvpx \
+            --disable-libx264 \
+            --disable-libxavs \
+            --disable-libxvid \
+            --disable-mlib \
+            --enable-zlib \
+            --enable-asm \
+            --disable-altivec \
+            --enable-amd3dnow \
+            --enable-amd3dnowext \
+            --enable-mmx \
+            --enable-mmx2 \
+            --enable-sse \
+            --enable-ssse3 \
+            --disable-avx \
+            --disable-armv5te \
+            --disable-armv6 \
+            --disable-armv6t2 \
+            --disable-armvfp \
+            --disable-iwmmxt \
+            --disable-mmi \
+            --disable-neon \
+            --disable-vis \
+            --enable-yasm \
+            --disable-sram \
+            --disable-symver \
+            --disable-debug \
+            --enable-optimizations \
+            --disable-extra-warnings \
+
+make
diff --git a/packages/addons/multimedia/libav/changelog.txt b/packages/addons/multimedia/libav/changelog.txt
new file mode 100644
index 0000000000..f9f2a03db2
--- /dev/null
+++ b/packages/addons/multimedia/libav/changelog.txt
@@ -0,0 +1,2 @@
+0.99.1
+- initial addon based on libav-0.7_beta2
diff --git a/packages/addons/multimedia/libav/icon/icon.png b/packages/addons/multimedia/libav/icon/icon.png
new file mode 100644
index 0000000000..55ca201e8c
Binary files /dev/null and b/packages/addons/multimedia/libav/icon/icon.png differ
diff --git a/packages/tools/meta b/packages/addons/multimedia/libav/meta
similarity index 61%
rename from packages/tools/meta
rename to packages/addons/multimedia/libav/meta
index 447074e2d0..68e80709fb 100644
--- a/packages/tools/meta
+++ b/packages/addons/multimedia/libav/meta
@@ -18,19 +18,30 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-PKG_NAME="tools"
-PKG_VERSION=""
+PKG_NAME="libav"
+PKG_VERSION="0.7_beta2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
-PKG_SITE="http://www.openelec.tv"
-PKG_URL=""
-PKG_DEPENDS="nano pastebinit evtest"
-PKG_BUILD_DEPENDS="toolchain"
+PKG_SITE="http://www.libav.org"
+PKG_URL="http://libav.org/releases/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="toolchain alsa-lib zlib bzip2"
 PKG_PRIORITY="optional"
-PKG_SECTION="debug"
-PKG_SHORTDESC="debug: Metapackage for installing some tools"
-PKG_LONGDESC="debug is a Metapackage for installing some tools"
-PKG_IS_ADDON="no"
+PKG_SECTION="lib/multimedia"
+PKG_SHORTDESC="libav: A complete audio and video stream library"
+PKG_LONGDESC="libav is a complete solution to record, convert and stream audio and video forked from FFMPEG. It includes libavcodec, the leading audio/video codec library."
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.python.script"
 
 PKG_AUTORECONF="no"
+
+if [ "$VDPAU" = yes ]; then
+  PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libvdpau"
+fi
+
+if [ "$VAAPI" = yes ]; then
+  PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libva"
+fi
+
diff --git a/packages/addons/multimedia/libav/source/default.py b/packages/addons/multimedia/libav/source/default.py
new file mode 100644
index 0000000000..2085a1f96d
--- /dev/null
+++ b/packages/addons/multimedia/libav/source/default.py
@@ -0,0 +1,23 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+import os
+import sys
+import xbmcaddon
diff --git a/packages/tools/nano/install b/packages/addons/networking/backup/rsync/addon
similarity index 91%
rename from packages/tools/nano/install
rename to packages/addons/networking/backup/rsync/addon
index 9fce2acdf8..d58902f2c7 100755
--- a/packages/tools/nano/install
+++ b/packages/addons/networking/backup/rsync/addon
@@ -22,5 +22,5 @@
 
 . config/options $1
 
-mkdir -p $INSTALL/usr/bin
-  cp $PKG_BUILD/src/nano $INSTALL/usr/bin
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp $PKG_BUILD/rsync $ADDON_BUILD/$PKG_ADDON_ID/bin
diff --git a/packages/multimedia/hts-tvheadend/install b/packages/addons/networking/backup/rsync/build
similarity index 80%
rename from packages/multimedia/hts-tvheadend/install
rename to packages/addons/networking/backup/rsync/build
index b6d0d8667d..2652dc6e7a 100755
--- a/packages/multimedia/hts-tvheadend/install
+++ b/packages/addons/networking/backup/rsync/build
@@ -22,11 +22,13 @@
 
 . config/options $1
 
-mkdir -p $INSTALL/usr/bin
-  cp -P $PKG_BUILD/build.Linux/tvheadend $INSTALL/usr/bin
+cd $PKG_BUILD
+./configure --host=$TARGET_NAME \
+            --build=$HOST_NAME \
+            --prefix=/usr \
+            --sysconfdir=/etc \
+            --localstatedir=/var \
+            --disable-acl-support \
+            --disable-xattr-support \
 
-mkdir -p $INSTALL/etc/pm/sleep.d
-  cp $PKG_DIR/sleep.d/* $INSTALL/etc/pm/sleep.d
-
-mkdir -p $INSTALL/lib/udev
-  cp $PKG_DIR/scripts/tvheadend_startup $INSTALL/lib/udev
+make
diff --git a/packages/addons/networking/backup/rsync/changelog.txt b/packages/addons/networking/backup/rsync/changelog.txt
new file mode 100644
index 0000000000..65521b3380
--- /dev/null
+++ b/packages/addons/networking/backup/rsync/changelog.txt
@@ -0,0 +1,5 @@
+0.99.2
+- prepare for release
+
+0.99.1
+- initial addon based on rsync-3.0.8
diff --git a/packages/addons/networking/backup/rsync/icon/icon.png b/packages/addons/networking/backup/rsync/icon/icon.png
new file mode 100644
index 0000000000..1efeeb9a03
Binary files /dev/null and b/packages/addons/networking/backup/rsync/icon/icon.png differ
diff --git a/packages/addons/networking/backup/rsync/meta b/packages/addons/networking/backup/rsync/meta
new file mode 100644
index 0000000000..d535cc7c5f
--- /dev/null
+++ b/packages/addons/networking/backup/rsync/meta
@@ -0,0 +1,38 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="rsync"
+PKG_VERSION="3.0.8"
+PKG_REV="2"
+PKG_ARCH="any"
+PKG_LICENSE="OSS"
+PKG_SITE="http://www.samba.org/ftp/rsync/rsync.html"
+PKG_URL="ftp://rsync.samba.org/pub/rsync/src/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="toolchain libiconv"
+PKG_PRIORITY="optional"
+PKG_SECTION="network/backup"
+PKG_SHORTDESC="rsync: A replacement for rcp that has many more features"
+PKG_LONGDESC="Rsync uses an own 'rsync' algorithm which provides a very fast method for bringing remote files into sync. It does this by sending just the differences in the files across the link, without requiring that both sets of files are present at one of the ends of the link beforehand. At first glance this may seem impossible because the calculation of diffs between two files normally requires local access to both files."
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.python.script"
+
+PKG_AUTORECONF="yes"
diff --git a/packages/addons/networking/backup/rsync/source/default.py b/packages/addons/networking/backup/rsync/source/default.py
new file mode 100644
index 0000000000..2085a1f96d
--- /dev/null
+++ b/packages/addons/networking/backup/rsync/source/default.py
@@ -0,0 +1,23 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+import os
+import sys
+import xbmcaddon
diff --git a/packages/addons/downloadmanager/transmission/addon b/packages/addons/service/downloadmanager/transmission/addon
similarity index 100%
rename from packages/addons/downloadmanager/transmission/addon
rename to packages/addons/service/downloadmanager/transmission/addon
diff --git a/packages/addons/downloadmanager/transmission/build b/packages/addons/service/downloadmanager/transmission/build
similarity index 100%
rename from packages/addons/downloadmanager/transmission/build
rename to packages/addons/service/downloadmanager/transmission/build
diff --git a/packages/addons/service/downloadmanager/transmission/changelog.txt b/packages/addons/service/downloadmanager/transmission/changelog.txt
new file mode 100644
index 0000000000..475dab6c3d
--- /dev/null
+++ b/packages/addons/service/downloadmanager/transmission/changelog.txt
@@ -0,0 +1,14 @@
+0.99.5
+- simplyfing start scripts
+
+0.99.4
+- fix paths
+
+0.99.3
+- prepare for release
+
+0.99.2
+- update to transmission-2.31
+
+0.99.1
+- initial version transmission-2.20
\ No newline at end of file
diff --git a/packages/addons/downloadmanager/transmission/icon/icon.png b/packages/addons/service/downloadmanager/transmission/icon/icon.png
similarity index 100%
rename from packages/addons/downloadmanager/transmission/icon/icon.png
rename to packages/addons/service/downloadmanager/transmission/icon/icon.png
diff --git a/packages/addons/downloadmanager/transmission/meta b/packages/addons/service/downloadmanager/transmission/meta
similarity index 96%
rename from packages/addons/downloadmanager/transmission/meta
rename to packages/addons/service/downloadmanager/transmission/meta
index d48123c707..58b68d3e9a 100644
--- a/packages/addons/downloadmanager/transmission/meta
+++ b/packages/addons/service/downloadmanager/transmission/meta
@@ -20,7 +20,7 @@
 
 PKG_NAME="transmission"
 PKG_VERSION="2.31"
-PKG_REV="3"
+PKG_REV="5"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.transmissionbt.com/"
@@ -28,7 +28,7 @@ PKG_URL="http://download.transmissionbt.com/files/$PKG_NAME-$PKG_VERSION.tar.bz2
 PKG_DEPENDS="zlib libiconv openssl curl libevent"
 PKG_BUILD_DEPENDS="toolchain libiconv zlib openssl curl libevent"
 PKG_PRIORITY="optional"
-PKG_SECTION="downloadmanager"
+PKG_SECTION="service/downloadmanager"
 PKG_SHORTDESC="transmission: a fast, easy and free BitTorrent client"
 PKG_LONGDESC="transmission is a fast, easy and free BitTorrent client"
 
diff --git a/packages/addons/downloadmanager/transmission/source/start.sh b/packages/addons/service/downloadmanager/transmission/source/bin/transmission.service
similarity index 70%
rename from packages/addons/downloadmanager/transmission/source/start.sh
rename to packages/addons/service/downloadmanager/transmission/source/bin/transmission.service
index 3a6c95b4b7..7c99fd7b9e 100755
--- a/packages/addons/downloadmanager/transmission/source/start.sh
+++ b/packages/addons/service/downloadmanager/transmission/source/bin/transmission.service
@@ -20,44 +20,11 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-XBMC_PID=$1
-APP=$2
-SCRIPT_DIR=$(dirname `readlink -f $0`)
-ADDON_HOME="$HOME/.xbmc/userdata/addon_data/addon.downloadmanager.transmission"
-PATH="${PATH}:${SCRIPT_DIR}/bin"
-LOG_FILE="${ADDON_HOME}/service.log"
+ADDON_DIR="$HOME/.xbmc/addons/service.downloadmanager.transmission"
+ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.downloadmanager.transmission"
+LOG_FILE="$ADDON_HOME/service.log"
 
-cleanup() {
-  local EXIT_STATUS=$1
-  if [ -n "${EXIT_STATUS}" ];then
-    EXIT_STATUS=0
-  fi
-  kill -15 "${APP_PID}"
-  exit $EXIT_STATUS;
-}
-
-# trap signals for clean shutdown
-  trap cleanup 1 2 3 15
-
-launch_app() {
-  local PID
-  eval "${APP} ${TRANSMISSION_ARG} &>${LOG_FILE} &"
-  APP_PID=$!
-}
-
-pid_is_running() {
-  local PID=${1}
-  for IPID in `ps -o pid | sed 's/[A-Za-z]//g' | sed 's/\ //g'`;do
-    if [ ${IPID} -eq ${PID} ];then
-      return 0
-    fi
-  done
-  return 1
-}
-
-app_prep() {
-
-export TRANSMISSION_WEB_HOME="$SCRIPT_DIR/web"
+export TRANSMISSION_WEB_HOME="$ADDON_DIR/web"
 
 mkdir -p $ADDON_HOME
 OPENELEC_SETTINGS="$ADDON_HOME/settings.xml"
@@ -86,7 +53,6 @@ TRANSMISSION_ARG="$TRANSMISSION_ARG --watch-dir /storage/downloads/watch"
 TRANSMISSION_ARG="$TRANSMISSION_ARG -e /var/log/transmission.log"
 TRANSMISSION_ARG="$TRANSMISSION_ARG -g /storage/.cache/transmission"
 TRANSMISSION_ARG="$TRANSMISSION_ARG -a $TRANSMISSION_IP"
-TRANSMISSION_ARG="$TRANSMISSION_ARG -f"
 
 if [ "$TRANSMISSION_AUTH" = "true" ]; then
   TRANSMISSION_ARG="$TRANSMISSION_ARG -t"
@@ -96,24 +62,4 @@ else
   TRANSMISSION_ARG="$TRANSMISSION_ARG -T"
 fi
 
-}
-
-main() {
-	app_prep
-	launch_app "${APP}"
-	pid_is_running "${XBMC_PID}"
-	XBMC_RUNNING=$?
-	pid_is_running "${APP_PID}"
-	APP_RUNNING=$?
-
-	while [ $XBMC_RUNNING -eq 0 -a ${APP_RUNNING} -eq 0 ]; do
-		sleep 1
-		pid_is_running "${XBMC_PID}"
-		XBMC_RUNNING=$?
-		pid_is_running "${APP_PID}"
-		APP_RUNNING=$?
-	done
-}
-
-main
-cleanup
+transmission-daemon $TRANSMISSION_ARG &>$LOG_FILE
diff --git a/packages/multimedia/hts-tvheadend/scripts/tvheadend_startup b/packages/addons/service/downloadmanager/transmission/source/default.py
old mode 100755
new mode 100644
similarity index 92%
rename from packages/multimedia/hts-tvheadend/scripts/tvheadend_startup
rename to packages/addons/service/downloadmanager/transmission/source/default.py
index 1137a8ea29..d56480efee
--- a/packages/multimedia/hts-tvheadend/scripts/tvheadend_startup
+++ b/packages/addons/service/downloadmanager/transmission/source/default.py
@@ -1,5 +1,3 @@
-#!/bin/sh
-
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
 #      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
@@ -20,6 +18,6 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-if [ ! $(pidof tvheadend) ];then
-  tvheadend -C -s -f -u root -g root
-fi
\ No newline at end of file
+import xbmc, time, os, subprocess
+
+os.system("transmission.service")
diff --git a/packages/addons/downloadmanager/transmission/source/resources/language/Dutch/strings.xml b/packages/addons/service/downloadmanager/transmission/source/resources/language/Dutch/strings.xml
similarity index 100%
rename from packages/addons/downloadmanager/transmission/source/resources/language/Dutch/strings.xml
rename to packages/addons/service/downloadmanager/transmission/source/resources/language/Dutch/strings.xml
diff --git a/packages/addons/downloadmanager/transmission/source/resources/language/English/strings.xml b/packages/addons/service/downloadmanager/transmission/source/resources/language/English/strings.xml
similarity index 100%
rename from packages/addons/downloadmanager/transmission/source/resources/language/English/strings.xml
rename to packages/addons/service/downloadmanager/transmission/source/resources/language/English/strings.xml
diff --git a/packages/addons/downloadmanager/transmission/source/resources/language/French/strings.xml b/packages/addons/service/downloadmanager/transmission/source/resources/language/French/strings.xml
similarity index 100%
rename from packages/addons/downloadmanager/transmission/source/resources/language/French/strings.xml
rename to packages/addons/service/downloadmanager/transmission/source/resources/language/French/strings.xml
diff --git a/packages/addons/downloadmanager/transmission/source/resources/language/German/strings.xml b/packages/addons/service/downloadmanager/transmission/source/resources/language/German/strings.xml
similarity index 100%
rename from packages/addons/downloadmanager/transmission/source/resources/language/German/strings.xml
rename to packages/addons/service/downloadmanager/transmission/source/resources/language/German/strings.xml
diff --git a/packages/addons/downloadmanager/transmission/source/resources/language/Norwegian/strings.xml b/packages/addons/service/downloadmanager/transmission/source/resources/language/Norwegian/strings.xml
similarity index 100%
rename from packages/addons/downloadmanager/transmission/source/resources/language/Norwegian/strings.xml
rename to packages/addons/service/downloadmanager/transmission/source/resources/language/Norwegian/strings.xml
diff --git a/packages/addons/downloadmanager/transmission/source/resources/settings.xml b/packages/addons/service/downloadmanager/transmission/source/resources/settings.xml
similarity index 100%
rename from packages/addons/downloadmanager/transmission/source/resources/settings.xml
rename to packages/addons/service/downloadmanager/transmission/source/resources/settings.xml
diff --git a/packages/addons/downloadmanager/transmission/source/settings.xml b/packages/addons/service/downloadmanager/transmission/source/settings.xml
similarity index 100%
rename from packages/addons/downloadmanager/transmission/source/settings.xml
rename to packages/addons/service/downloadmanager/transmission/source/settings.xml
diff --git a/packages/tools/evtest/install b/packages/addons/service/multimedia/hts-tvheadend/addon
similarity index 90%
rename from packages/tools/evtest/install
rename to packages/addons/service/multimedia/hts-tvheadend/addon
index afab86665b..3e0ab9a67c 100755
--- a/packages/tools/evtest/install
+++ b/packages/addons/service/multimedia/hts-tvheadend/addon
@@ -22,6 +22,5 @@
 
 . config/options $1
 
-mkdir -p $INSTALL/usr/bin
-  cp $PKG_BUILD/evtest $INSTALL/usr/bin
-  cp $PKG_BUILD/evtest-capture $INSTALL/usr/bin
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp -P $PKG_BUILD/build.Linux/tvheadend $ADDON_BUILD/$PKG_ADDON_ID/bin
diff --git a/packages/multimedia/hts-tvheadend/build b/packages/addons/service/multimedia/hts-tvheadend/build
similarity index 100%
rename from packages/multimedia/hts-tvheadend/build
rename to packages/addons/service/multimedia/hts-tvheadend/build
diff --git a/packages/addons/service/multimedia/hts-tvheadend/changelog.txt b/packages/addons/service/multimedia/hts-tvheadend/changelog.txt
new file mode 100644
index 0000000000..c536c2d067
--- /dev/null
+++ b/packages/addons/service/multimedia/hts-tvheadend/changelog.txt
@@ -0,0 +1,5 @@
+0.99.2
+- rework start scripts
+
+0.99.1
+- initial version hts-tvheadend-90e3570
diff --git a/packages/addons/service/multimedia/hts-tvheadend/icon/icon.png b/packages/addons/service/multimedia/hts-tvheadend/icon/icon.png
new file mode 100644
index 0000000000..f0bb3997e7
Binary files /dev/null and b/packages/addons/service/multimedia/hts-tvheadend/icon/icon.png differ
diff --git a/packages/multimedia/hts-tvheadend/meta b/packages/addons/service/multimedia/hts-tvheadend/meta
similarity index 95%
rename from packages/multimedia/hts-tvheadend/meta
rename to packages/addons/service/multimedia/hts-tvheadend/meta
index d9145c8059..613d6795ca 100644
--- a/packages/multimedia/hts-tvheadend/meta
+++ b/packages/addons/service/multimedia/hts-tvheadend/meta
@@ -20,7 +20,7 @@
 
 PKG_NAME="hts-tvheadend"
 PKG_VERSION="90e3570"
-PKG_REV="1"
+PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html"
@@ -29,9 +29,11 @@ PKG_URL="$OPENELEC_SRC/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS="libiconv avahi"
 PKG_BUILD_DEPENDS="toolchain libiconv avahi"
 PKG_PRIORITY="optional"
-PKG_SECTION="multimedia"
+PKG_SECTION="service/multimedia"
 PKG_SHORTDESC="hts-tvheadend: a TV streaming server for Linux supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, and Analog video (V4L) as input sources."
 PKG_LONGDESC="HTS-Tvheadend is a TV streaming server for Linux supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, and Analog video (V4L) as input sources. It also comes with a powerful and easy to use web interface both used for configuration and day-to-day operations, such as searching the EPG and scheduling recordings. Even so, the most notable feature of Tvheadend is how easy it is to set up: Install it, navigate to the web user interface, drill into the TV adapters tab, select your current location and Tvheadend will start scanning channels and present them to you in just a few minutes"
-PKG_IS_ADDON="no"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.service"
 
 PKG_AUTORECONF="no"
diff --git a/packages/addons/service/multimedia/hts-tvheadend/source/bin/tvheadend.service b/packages/addons/service/multimedia/hts-tvheadend/source/bin/tvheadend.service
new file mode 100755
index 0000000000..ce5aa960b8
--- /dev/null
+++ b/packages/addons/service/multimedia/hts-tvheadend/source/bin/tvheadend.service
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+ADDON_DIR="$HOME/.xbmc/addons/service.multimedia.hts-tvheadend"
+ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.multimedia.hts-tvheadend"
+LOG_FILE="$ADDON_HOME/service.log"
+
+TVHEADEND_ARG="-f -C -s -u root -g root -c $ADDON_HOME"
+
+mkdir -p $ADDON_HOME
+  tvheadend $TVHEADEND_ARG &>$LOG_FILE
diff --git a/packages/addons/service/multimedia/hts-tvheadend/source/default.py b/packages/addons/service/multimedia/hts-tvheadend/source/default.py
new file mode 100644
index 0000000000..b386a8df08
--- /dev/null
+++ b/packages/addons/service/multimedia/hts-tvheadend/source/default.py
@@ -0,0 +1,23 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+import xbmc, time, os, subprocess
+
+os.system("tvheadend.service")
diff --git a/packages/addons/shell/texteditor/nano/addon b/packages/addons/shell/texteditor/nano/addon
new file mode 100755
index 0000000000..f8c68ddcaa
--- /dev/null
+++ b/packages/addons/shell/texteditor/nano/addon
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp $PKG_BUILD/src/nano $ADDON_BUILD/$PKG_ADDON_ID/bin
diff --git a/packages/tools/nano/build b/packages/addons/shell/texteditor/nano/build
similarity index 97%
rename from packages/tools/nano/build
rename to packages/addons/shell/texteditor/nano/build
index d39a87f2f0..ea9022a29b 100755
--- a/packages/tools/nano/build
+++ b/packages/addons/shell/texteditor/nano/build
@@ -25,6 +25,8 @@
 # nano fails to build with GOLD linker
   strip_gold
 
+LDFLAGS="$LDFLAGS -static"
+
 cd $PKG_BUILD
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
diff --git a/packages/addons/shell/texteditor/nano/changelog.txt b/packages/addons/shell/texteditor/nano/changelog.txt
new file mode 100644
index 0000000000..b58f592898
--- /dev/null
+++ b/packages/addons/shell/texteditor/nano/changelog.txt
@@ -0,0 +1,5 @@
+0.99.2
+- prepare for release
+
+0.99.1
+- initial addon based on nano-2.3.0
diff --git a/packages/addons/shell/texteditor/nano/icon/icon.png b/packages/addons/shell/texteditor/nano/icon/icon.png
new file mode 100644
index 0000000000..70c6da0693
Binary files /dev/null and b/packages/addons/shell/texteditor/nano/icon/icon.png differ
diff --git a/packages/tools/nano/meta b/packages/addons/shell/texteditor/nano/meta
similarity index 93%
rename from packages/tools/nano/meta
rename to packages/addons/shell/texteditor/nano/meta
index e2ac257fea..b21e811c0d 100644
--- a/packages/tools/nano/meta
+++ b/packages/addons/shell/texteditor/nano/meta
@@ -20,7 +20,7 @@
 
 PKG_NAME="nano"
 PKG_VERSION="2.3.0"
-PKG_REV="1"
+PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.nano-editor.org/"
@@ -28,9 +28,11 @@ PKG_URL="http://ftp.gnu.org/gnu/nano/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS="ncurses"
 PKG_BUILD_DEPENDS="toolchain ncurses"
 PKG_PRIORITY="optional"
-PKG_SECTION="tools"
+PKG_SECTION="shell/texteditor"
 PKG_SHORTDESC="nano: Pico editor clone with enhancements"
 PKG_LONGDESC="GNU nano (Nano's ANOther editor, or Not ANOther editor) is an enhanced clone of the Pico text editor."
-PKG_IS_ADDON="no"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.python.script"
 
 PKG_AUTORECONF="yes"
diff --git a/packages/addons/shell/texteditor/nano/source/default.py b/packages/addons/shell/texteditor/nano/source/default.py
new file mode 100644
index 0000000000..2085a1f96d
--- /dev/null
+++ b/packages/addons/shell/texteditor/nano/source/default.py
@@ -0,0 +1,23 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+import os
+import sys
+import xbmcaddon
diff --git a/packages/debug/meta b/packages/debug/meta
index bed0ab027f..98a35bcff8 100644
--- a/packages/debug/meta
+++ b/packages/debug/meta
@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
-PKG_DEPENDS="strace gdb mesa-demos tvdump w_scan tools htop mrxvt"
+PKG_DEPENDS="strace gdb mesa-demos tvdump w_scan mrxvt"
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="debug"
diff --git a/packages/devel/libiconv/build b/packages/devel/libiconv/build
index d3687974c7..17a9ace656 100755
--- a/packages/devel/libiconv/build
+++ b/packages/devel/libiconv/build
@@ -27,7 +27,7 @@ cd $PKG_BUILD
             --build=$HOST_NAME \
             --prefix=/usr \
             --sysconfdir=/etc \
-            --disable-static \
+            --enable-static \
             --enable-shared \
             --disable-nls \
             --disable-extra-encodings \
diff --git a/packages/devel/ncurses/build b/packages/devel/ncurses/build
index 61c618bb51..f7e11e11f5 100755
--- a/packages/devel/ncurses/build
+++ b/packages/devel/ncurses/build
@@ -58,7 +58,7 @@ cd $PKG_BUILD
             --without-ada \
             --without-progs \
             --with-shared \
-            --without-normal \
+            --with-normal \
             --without-debug \
             --without-profile \
             --with-termlib \
diff --git a/packages/mediacenter/meta b/packages/mediacenter/meta
index 641f4a7a39..0632bce908 100644
--- a/packages/mediacenter/meta
+++ b/packages/mediacenter/meta
@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
-PKG_DEPENDS="$MEDIACENTER $MEDIACENTER-theme-$SKIN_DEFAULT plugins"
+PKG_DEPENDS="$MEDIACENTER $MEDIACENTER-theme-$SKIN_DEFAULT"
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="mediacenter"
diff --git a/packages/multimedia/hts-tvheadend/sleep.d/50_tvheadend b/packages/multimedia/hts-tvheadend/sleep.d/50_tvheadend
deleted file mode 100755
index 91f3a2fb0e..0000000000
--- a/packages/multimedia/hts-tvheadend/sleep.d/50_tvheadend
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. /etc/profile
-
-LOCKDIR="/var/lock/"
-LOCKFILE="tvheadend"
-
-case "$1" in
-  hibernate|suspend)
-    if [ $(pidof tvheadend) ];then
-      progress "Shutting down HTS TVHeadend for suspending..."
-      mkdir -p "$LOCKDIR"
-      touch "$LOCKDIR/$LOCKFILE"
-      killall tvheadend
-    fi
-    ;;
-
-  thaw|resume)
-    if [ -f "$LOCKDIR/$LOCKFILE" ];then
-      progress "Restarting HTS TVHeadend for wakeup..."
-      tvheadend -C -s -f -u root -g root
-      rm -rf "$LOCKDIR/$LOCKFILE"
-    fi
-    ;;
-
-  *) exit $NA
-    ;;
-esac
diff --git a/packages/multimedia/hts-tvheadend/udev.d/76-tvheadend.rules b/packages/multimedia/hts-tvheadend/udev.d/76-tvheadend.rules
deleted file mode 100644
index 8e00208484..0000000000
--- a/packages/multimedia/hts-tvheadend/udev.d/76-tvheadend.rules
+++ /dev/null
@@ -1,30 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-# only does something with adding "dvb" subsystem devices.
-ACTION!="add|remove", GOTO="end"
-SUBSYSTEM!="dvb", GOTO="end"
-ENV{DVB_DEVICE_TYPE}!="frontend", GOTO="end"
-
-# Start TVHeadend if dvb frontend is starting
-ACTION=="add", RUN+="/lib/udev/tvheadend_startup"
-ACTION=="remove", RUN+="/usr/bin/killall tvheadend"
-
-LABEL="end"
diff --git a/packages/sysutils/busybox/meta b/packages/sysutils/busybox/meta
index 2a8d554877..640cb615b0 100644
--- a/packages/sysutils/busybox/meta
+++ b/packages/sysutils/busybox/meta
@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.busybox.net"
 PKG_URL="http://busybox.net/downloads/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="grep hdparm speedcontrol"
+PKG_DEPENDS="grep hdparm speedcontrol pastebinit"
 PKG_BUILD_DEPENDS="toolchain busybox-hosttools"
 PKG_PRIORITY="required"
 PKG_SECTION="system"
diff --git a/packages/sysutils/udev/build b/packages/sysutils/udev/build
index e73ec438e8..b592e7927e 100755
--- a/packages/sysutils/udev/build
+++ b/packages/sysutils/udev/build
@@ -55,6 +55,7 @@ LDFLAGS="$LDFLAGS -I$SYSROOT_PREFIX/usr/include/glib-2.0" \
             --without-systemdsystemunitdir \
             --with-firmware-path=/lib/firmware \
             --with-pci-ids-path=/usr/share/pci.ids \
+            --with-usb-ids-path=/usr/share/usb.ids \
             --with-gnu-ld \
 
 make
diff --git a/packages/sysutils/udev/meta b/packages/sysutils/udev/meta
index 094b9a00e8..a999e31272 100644
--- a/packages/sysutils/udev/meta
+++ b/packages/sysutils/udev/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="udev"
-PKG_VERSION="170"
+PKG_VERSION="171"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/textproc/libxml2/build b/packages/textproc/libxml2/build
index 3fa619dad4..cb827c7cb6 100755
--- a/packages/textproc/libxml2/build
+++ b/packages/textproc/libxml2/build
@@ -30,7 +30,7 @@ cd .build-target
              --build=$HOST_NAME \
              --prefix=/usr \
              --sysconfdir=/etc \
-             --disable-static \
+             --enable-static \
              --enable-shared \
              --with-iconv \
              --disable-ipv6 \
diff --git a/packages/x11/driver/xf86-video-ati/meta b/packages/x11/driver/xf86-video-ati/meta
index 7886cc5066..727ff44e24 100644
--- a/packages/x11/driver/xf86-video-ati/meta
+++ b/packages/x11/driver/xf86-video-ati/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xf86-video-ati"
-PKG_VERSION="6.14.1"
+PKG_VERSION="6.14.2"
 PKG_REV="1"
 PKG_ARCH="i386 x86_64"
 PKG_LICENSE="OSS"
diff --git a/packages/x11/util/util-macros/meta b/packages/x11/util/util-macros/meta
index 9af195d62e..5d376bd23a 100644
--- a/packages/x11/util/util-macros/meta
+++ b/packages/x11/util/util-macros/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="util-macros"
-PKG_VERSION="1.13.0"
+PKG_VERSION="1.14.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
diff --git a/packages/x11/xserver/xorg-server/build b/packages/x11/xserver/xorg-server/build
index ef9ee2e7be..e8c04212a1 100755
--- a/packages/x11/xserver/xorg-server/build
+++ b/packages/x11/xserver/xorg-server/build
@@ -67,7 +67,7 @@ cd $PKG_BUILD
             $XORG_XINERAMA \
             --enable-mitshm \
             --disable-xres \
-            --disable-record \
+            --enable-record \
             --enable-xv \
             --disable-xvmc \
             --enable-dga \
diff --git a/packages/x11/xserver/xorg-server/install b/packages/x11/xserver/xorg-server/install
index 27af4552ce..2998966072 100755
--- a/packages/x11/xserver/xorg-server/install
+++ b/packages/x11/xserver/xorg-server/install
@@ -46,6 +46,7 @@ mkdir -p $XORG_DST
 
 mkdir -p $XORG_DST/extensions
   cp -P $XORG_SRC/dixmods/.libs/libdbe.so $XORG_DST/extensions
+  cp -P $XORG_SRC/dixmods/.libs/librecord.so $XORG_DST/extensions
   cp -P $XORG_SRC/dri/.libs/libdri.so $XORG_DST/extensions
   cp -P $XORG_SRC/dri2/.libs/libdri2.so $XORG_DST/extensions
   cp -P $XORG_SRC/dixmods/extmod/.libs/libextmod.so $XORG_DST/extensions
diff --git a/packages/x11/xserver/xorg-server/meta b/packages/x11/xserver/xorg-server/meta
index 402cdba575..c3445ec078 100644
--- a/packages/x11/xserver/xorg-server/meta
+++ b/packages/x11/xserver/xorg-server/meta
@@ -19,14 +19,14 @@
 ################################################################################
 
 PKG_NAME="xorg-server"
-PKG_VERSION="1.10.1.902"
+PKG_VERSION="1.10.2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.X.org"
 PKG_URL="http://xorg.freedesktop.org/archive/individual/xserver/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="libpciaccess freetype libX11 libXfont libdrm Mesa openssl pixman udev"
-PKG_BUILD_DEPENDS="toolchain util-macros font-util fontsproto randrproto renderproto scrnsaverproto videoproto inputproto xf86dgaproto xf86driproto xf86miscproto glproto libpciaccess libX11 libXfont libxkbfile libdrm Mesa openssl freetype pixman fontsproto udev"
+PKG_BUILD_DEPENDS="toolchain util-macros font-util fontsproto randrproto recordproto renderproto scrnsaverproto videoproto inputproto xf86dgaproto xf86driproto xf86miscproto glproto libpciaccess libX11 libXfont libxkbfile libdrm Mesa openssl freetype pixman fontsproto udev"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/xserver"
 PKG_SHORTDESC="xorg-server: The Xorg X server"
diff --git a/packages/x11/xserver/xorg-server/patches/xorg-server-1.10.1.902-05_pkg_config.patch b/packages/x11/xserver/xorg-server/patches/xorg-server-1.10.2-05_pkg_config.patch
similarity index 100%
rename from packages/x11/xserver/xorg-server/patches/xorg-server-1.10.1.902-05_pkg_config.patch
rename to packages/x11/xserver/xorg-server/patches/xorg-server-1.10.2-05_pkg_config.patch
diff --git a/packages/x11/xserver/xorg-server/patches/xorg-server-1.10.1.902-10_cache_xkbcomp_output_for_fast_start_up.patch b/packages/x11/xserver/xorg-server/patches/xorg-server-1.10.2-10_cache_xkbcomp_output_for_fast_start_up.patch
similarity index 100%
rename from packages/x11/xserver/xorg-server/patches/xorg-server-1.10.1.902-10_cache_xkbcomp_output_for_fast_start_up.patch
rename to packages/x11/xserver/xorg-server/patches/xorg-server-1.10.2-10_cache_xkbcomp_output_for_fast_start_up.patch
diff --git a/packages/x11/xserver/xorg-server/patches/xorg-server-1.10.1.902-11_use_sloppy_heuristic_first_for_initial_mode.patch b/packages/x11/xserver/xorg-server/patches/xorg-server-1.10.2-11_use_sloppy_heuristic_first_for_initial_mode.patch
similarity index 100%
rename from packages/x11/xserver/xorg-server/patches/xorg-server-1.10.1.902-11_use_sloppy_heuristic_first_for_initial_mode.patch
rename to packages/x11/xserver/xorg-server/patches/xorg-server-1.10.2-11_use_sloppy_heuristic_first_for_initial_mode.patch
diff --git a/packages/x11/xserver/xorg-server/patches/xorg-server-1.10.1.902-13_nouveau.patch b/packages/x11/xserver/xorg-server/patches/xorg-server-1.10.2-13_nouveau.patch
similarity index 100%
rename from packages/x11/xserver/xorg-server/patches/xorg-server-1.10.1.902-13_nouveau.patch
rename to packages/x11/xserver/xorg-server/patches/xorg-server-1.10.2-13_nouveau.patch
diff --git a/packages/x11/xserver/xorg-server/patches/xorg-server-1.10.1.902-14_nvidia_fglrx_autodetect.patch b/packages/x11/xserver/xorg-server/patches/xorg-server-1.10.2-14_nvidia_fglrx_autodetect.patch
similarity index 100%
rename from packages/x11/xserver/xorg-server/patches/xorg-server-1.10.1.902-14_nvidia_fglrx_autodetect.patch
rename to packages/x11/xserver/xorg-server/patches/xorg-server-1.10.2-14_nvidia_fglrx_autodetect.patch
diff --git a/packages/x11/xserver/xorg-server/patches/xorg-server-1.10.1.902-20_extra_modelines_fromxorg.patch b/packages/x11/xserver/xorg-server/patches/xorg-server-1.10.2-20_extra_modelines_fromxorg.patch
similarity index 100%
rename from packages/x11/xserver/xorg-server/patches/xorg-server-1.10.1.902-20_extra_modelines_fromxorg.patch
rename to packages/x11/xserver/xorg-server/patches/xorg-server-1.10.2-20_extra_modelines_fromxorg.patch
diff --git a/packages/x11/xserver/xorg-server/patches/xorg-server-1.10.1.902-21_x11_nonroot-vesa.patch b/packages/x11/xserver/xorg-server/patches/xorg-server-1.10.2-21_x11_nonroot-vesa.patch
similarity index 100%
rename from packages/x11/xserver/xorg-server/patches/xorg-server-1.10.1.902-21_x11_nonroot-vesa.patch
rename to packages/x11/xserver/xorg-server/patches/xorg-server-1.10.2-21_x11_nonroot-vesa.patch
diff --git a/packages/x11/xserver/xorg-server/patches/xorg-server-1.10.1.902-22_do_not_zap_xserver.patch b/packages/x11/xserver/xorg-server/patches/xorg-server-1.10.2-22_do_not_zap_xserver.patch
similarity index 100%
rename from packages/x11/xserver/xorg-server/patches/xorg-server-1.10.1.902-22_do_not_zap_xserver.patch
rename to packages/x11/xserver/xorg-server/patches/xorg-server-1.10.2-22_do_not_zap_xserver.patch
diff --git a/packages/x11/xserver/xorg-server/patches/xorg-server-1.10.1.902-25_less_acpi_brokenness.patch b/packages/x11/xserver/xorg-server/patches/xorg-server-1.10.2-25_less_acpi_brokenness.patch
similarity index 100%
rename from packages/x11/xserver/xorg-server/patches/xorg-server-1.10.1.902-25_less_acpi_brokenness.patch
rename to packages/x11/xserver/xorg-server/patches/xorg-server-1.10.2-25_less_acpi_brokenness.patch
diff --git a/projects/ATV/options b/projects/ATV/options
index 9d802a9b24..ccc3da31a2 100644
--- a/projects/ATV/options
+++ b/projects/ATV/options
@@ -116,9 +116,6 @@
 # (DVD decryption support in XBMC) (yes / no)
   DVDCSS_SUPPORT="yes"
 
-# build and install Tvheadend TV server (yes / no)
-  TVHEADEND="yes"
-
 # additional drivers to install:
 # bcm_sta:          Broadcom STA WLAN Driver
 # Space separated list is supported,
@@ -143,10 +140,6 @@
 # build and install SFTP Server (yes / no)
   SFTP_SERVER="yes"
 
-# build and install some tools for including in release (yes / no)
-# some of this tools are: htop, nano, wgetpaste
-  TOOLS="yes"
-
 # build and install diskmounter service (udisks)
 # this service provide auto mounting support for external drives
 # in the mediacenter also automount internally drives at boottime (yes / no)
diff --git a/projects/Fusion/options b/projects/Fusion/options
index ea9a0947e0..d0654052b9 100644
--- a/projects/Fusion/options
+++ b/projects/Fusion/options
@@ -116,9 +116,6 @@
 # (DVD decryption support in XBMC) (yes / no)
   DVDCSS_SUPPORT="yes"
 
-# build and install Tvheadend TV server (yes / no)
-  TVHEADEND="yes"
-
 # additional drivers to install:
 # bcm_sta:          Broadcom STA WLAN Driver
 # Space separated list is supported,
@@ -143,10 +140,6 @@
 # build and install SFTP Server (yes / no)
   SFTP_SERVER="yes"
 
-# build and install some tools for including in release (yes / no)
-# some of this tools are: htop, nano, wgetpaste
-  TOOLS="yes"
-
 # build and install diskmounter service (udisks)
 # this service provide auto mounting support for external drives
 # in the mediacenter also automount internally drives at boottime (yes / no)
diff --git a/projects/Generic/options b/projects/Generic/options
index 84a0466b51..b6041558d6 100644
--- a/projects/Generic/options
+++ b/projects/Generic/options
@@ -116,9 +116,6 @@
 # (DVD decryption support in XBMC) (yes / no)
   DVDCSS_SUPPORT="yes"
 
-# build and install Tvheadend TV server (yes / no)
-  TVHEADEND="yes"
-
 # additional drivers to install:
 # bcm_sta:          Broadcom STA WLAN Driver
 # Space separated list is supported,
@@ -143,10 +140,6 @@
 # build and install SFTP Server (yes / no)
   SFTP_SERVER="yes"
 
-# build and install some tools for including in release (yes / no)
-# some of this tools are: htop, nano, wgetpaste
-  TOOLS="yes"
-
 # build and install diskmounter service (udisks)
 # this service provide auto mounting support for external drives
 # in the mediacenter also automount internally drives at boottime (yes / no)
diff --git a/projects/ION/options b/projects/ION/options
index 167c423ec0..686e01f069 100644
--- a/projects/ION/options
+++ b/projects/ION/options
@@ -116,9 +116,6 @@
 # (DVD decryption support in XBMC) (yes / no)
   DVDCSS_SUPPORT="yes"
 
-# build and install Tvheadend TV server (yes / no)
-  TVHEADEND="yes"
-
 # additional drivers to install:
 # bcm_sta:          Broadcom STA WLAN Driver
 # Space separated list is supported,
@@ -143,10 +140,6 @@
 # build and install SFTP Server (yes / no)
   SFTP_SERVER="yes"
 
-# build and install some tools for including in release (yes / no)
-# some of this tools are: htop, nano, wgetpaste
-  TOOLS="yes"
-
 # build and install diskmounter service (udisks)
 # this service provide auto mounting support for external drives
 # in the mediacenter also automount internally drives at boottime (yes / no)
diff --git a/projects/Intel/options b/projects/Intel/options
index 936e79432e..b0e9b8c4bb 100644
--- a/projects/Intel/options
+++ b/projects/Intel/options
@@ -116,9 +116,6 @@
 # (DVD decryption support in XBMC) (yes / no)
   DVDCSS_SUPPORT="yes"
 
-# build and install Tvheadend TV server (yes / no)
-  TVHEADEND="yes"
-
 # additional drivers to install:
 # bcm_sta:          Broadcom STA WLAN Driver
 # Space separated list is supported,
@@ -143,10 +140,6 @@
 # build and install SFTP Server (yes / no)
   SFTP_SERVER="yes"
 
-# build and install some tools for including in release (yes / no)
-# some of this tools are: htop, nano, wgetpaste
-  TOOLS="yes"
-
 # build and install diskmounter service (udisks)
 # this service provide auto mounting support for external drives
 # in the mediacenter also automount internally drives at boottime (yes / no)
diff --git a/scripts/create_addon b/scripts/create_addon
index 407cc7e1ff..9d64210415 100755
--- a/scripts/create_addon
+++ b/scripts/create_addon
@@ -92,8 +92,8 @@ if [ -f $PKG_DIR/addon ]; then
     zip -rq $PKG_ADDON_ID-$OS_VERSION.$PKG_REV.zip $PKG_ADDON_ID;
   cd -
 
-  mkdir -p $ADDON_BUILD/target/$PKG_ADDON_ID
-    cp $ADDON_BUILD/$PKG_ADDON_ID-$OS_VERSION.$PKG_REV.zip $ADDON_BUILD/target/$PKG_ADDON_ID
-    cp $PKG_DIR/changelog.txt $ADDON_BUILD/target/$PKG_ADDON_ID/changelog-$OS_VERSION.$PKG_REV.txt
-    cp $PKG_DIR/icon/icon.png $ADDON_BUILD/target/$PKG_ADDON_ID/icon.png
+  mkdir -p $TARGET/$ADDONS/$OS_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID
+    cp $ADDON_BUILD/$PKG_ADDON_ID-$OS_VERSION.$PKG_REV.zip $TARGET/$ADDONS/$OS_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID
+    cp $PKG_DIR/changelog.txt $TARGET/$ADDONS/$OS_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID/changelog-$OS_VERSION.$PKG_REV.txt
+    cp $PKG_DIR/icon/icon.png $TARGET/$ADDONS/$OS_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID/icon.png
 fi
diff --git a/scripts/image b/scripts/image
index 706c350fe3..7602734010 100755
--- a/scripts/image
+++ b/scripts/image
@@ -100,7 +100,6 @@ mkdir -p $INSTALL
 
 # Multimedia support
   [ ! "$MEDIACENTER" = "no" ] && $SCRIPTS/install mediacenter
-  [ "$TVHEADEND" = "yes" ] && $SCRIPTS/install hts-tvheadend
 
 # Automounter support
   [ "$UDISKS" = "yes" ] && $SCRIPTS/install udisks
@@ -130,9 +129,6 @@ mkdir -p $INSTALL
 # Update support
   [ "$INSTALLER_SUPPORT" = "yes" ] && $SCRIPTS/install installer
 
-# some system tools
-  [ "$TOOLS" = "yes" ] && $SCRIPTS/install tools
-
 # Devtools... (not for Release)
   [ "$TESTING" = "yes" ] && $SCRIPTS/install testing
   [ "$DEVTOOLS" = "yes" ] && $SCRIPTS/install debug