diff --git a/packages/addons/debugging/tools/htop/changelog.txt b/packages/addons/debugging/tools/htop/changelog.txt
deleted file mode 100644
index 07a22e4b4f..0000000000
--- a/packages/addons/debugging/tools/htop/changelog.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-3.0.2
-- update to htop-1.0.2
-
-3.0.1
-- bump addon version
-
-2.1.2
-- cleanup
-
-2.1.1
-- rebuild for addon version 2.1
-- update to htop-1.0.1
-
-2.0.0
-- prepare for OpenELEC-2.0 release
-- update to htop-1.0
-
-1.90.1
-- depends on xbmc.python API 2.0
-
-1.90.0
-- prepare for OpenELEC-1.90 release
-
-1.0.0
-- prepare for OpenELEC-1.0 release
-
-0.99.4
-- change icon
-
-0.99.3
-- build as shared lib
-- include ncurses libs
-
-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
deleted file mode 100644
index 07a2f44796..0000000000
Binary files a/packages/addons/debugging/tools/htop/icon/icon.png and /dev/null differ
diff --git a/packages/addons/debugging/tools/htop/source/default.py b/packages/addons/debugging/tools/htop/source/default.py
deleted file mode 100644
index 8d4c5e9e96..0000000000
--- a/packages/addons/debugging/tools/htop/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/debugging/tools/htop/build b/packages/debug/htop/build
similarity index 100%
rename from packages/addons/debugging/tools/htop/build
rename to packages/debug/htop/build
diff --git a/packages/addons/debugging/tools/htop/addon b/packages/debug/htop/install
similarity index 92%
rename from packages/addons/debugging/tools/htop/addon
rename to packages/debug/htop/install
index 5585786245..bdada00f1e 100755
--- a/packages/addons/debugging/tools/htop/addon
+++ b/packages/debug/htop/install
@@ -22,5 +22,5 @@
 
 . config/options $1
 
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp $PKG_BUILD/htop $ADDON_BUILD/$PKG_ADDON_ID/bin
+mkdir -p $INSTALL/usr/bin
+  cp $PKG_BUILD/htop $INSTALL/usr/bin
diff --git a/packages/addons/debugging/tools/htop/meta b/packages/debug/htop/meta
similarity index 95%
rename from packages/addons/debugging/tools/htop/meta
rename to packages/debug/htop/meta
index c60d0fba69..aae01fba2f 100644
--- a/packages/addons/debugging/tools/htop/meta
+++ b/packages/debug/htop/meta
@@ -20,7 +20,7 @@
 
 PKG_NAME="htop"
 PKG_VERSION="1.0.2"
-PKG_REV="2"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://htop.sourceforge.net/"
@@ -32,7 +32,6 @@ 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="yes"
-PKG_ADDON_TYPE="xbmc.python.script"
+PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="yes"
diff --git a/packages/debug/meta b/packages/debug/meta
index d7baf36dee..ec0d08a6b6 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="acpica cpuid dmidecode evtest gdb hddtemp i2c-tools pmtools powertop strace"
+PKG_DEPENDS="acpica cpuid dmidecode evtest gdb hddtemp htop i2c-tools pmtools powertop strace"
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="debug"