diff --git a/packages/tools/htop/install b/packages/addons/debug/tools/htop/addon
similarity index 92%
rename from packages/tools/htop/install
rename to packages/addons/debug/tools/htop/addon
index 3fc9351243..7c8c3526b8 100755
--- a/packages/tools/htop/install
+++ b/packages/addons/debug/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/debug/tools/htop/build
similarity index 95%
rename from packages/tools/htop/build
rename to packages/addons/debug/tools/htop/build
index 60dac122c4..477d01ea61 100755
--- a/packages/tools/htop/build
+++ b/packages/addons/debug/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/debug/tools/htop/changelog.txt b/packages/addons/debug/tools/htop/changelog.txt
new file mode 100644
index 0000000000..95e36cef53
--- /dev/null
+++ b/packages/addons/debug/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/debug/tools/htop/icon/icon.png b/packages/addons/debug/tools/htop/icon/icon.png
new file mode 100644
index 0000000000..c1cc6c21a3
Binary files /dev/null and b/packages/addons/debug/tools/htop/icon/icon.png differ
diff --git a/packages/tools/htop/meta b/packages/addons/debug/tools/htop/meta
similarity index 94%
rename from packages/tools/htop/meta
rename to packages/addons/debug/tools/htop/meta
index 46eb0fe9ec..778da7ec74 100644
--- a/packages/tools/htop/meta
+++ b/packages/addons/debug/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/debug/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/debug/tools/htop/patches/htop-0.9-crosscompiling-0.1.patch
diff --git a/packages/addons/debug/tools/htop/source/default.py b/packages/addons/debug/tools/htop/source/default.py
new file mode 100644
index 0000000000..2085a1f96d
--- /dev/null
+++ b/packages/addons/debug/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