diff --git a/packages/addons/debugging/tools/evtest/addon b/packages/addons/debugging/tools/evtest/addon
deleted file mode 100755
index 59d78f16aa..0000000000
--- a/packages/addons/debugging/tools/evtest/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/evtest $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp $PKG_BUILD/evtest-capture $ADDON_BUILD/$PKG_ADDON_ID/bin
diff --git a/packages/addons/debugging/tools/evtest/changelog.txt b/packages/addons/debugging/tools/evtest/changelog.txt
deleted file mode 100644
index dcc31236de..0000000000
--- a/packages/addons/debugging/tools/evtest/changelog.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-3.0.1
-- bump addon version
-
-2.1.3
-- update to evtest-1.30
-
-2.1.2
-- cleanup
-
-2.1.1
-- rebuild for addon version 2.1
-
-2.0.1
-- rebuild for libiconv changes
-
-2.0.0
-- prepare for OpenELEC-2.0 release
-
-1.90.1
-- depends on xbmc.python API 2.0
-
-1.90.0
-- prepare for OpenELEC-1.90 release
-
-1.0.0
-- update to evtest-1.29
-- prepare for OpenELEC-1.0 release
-
-0.99.3
-- change icon
-
-0.99.2
-- build as shared lib
-- include libiconv libs
-- include libxml2 libs
-- include zlib libs
-
-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
deleted file mode 100644
index 47d97637e0..0000000000
Binary files a/packages/addons/debugging/tools/evtest/icon/icon.png and /dev/null differ
diff --git a/packages/addons/debugging/tools/evtest/build b/packages/debug/evtest/build
similarity index 100%
rename from packages/addons/debugging/tools/evtest/build
rename to packages/debug/evtest/build
diff --git a/packages/addons/debugging/tools/evtest/source/default.py b/packages/debug/evtest/install
old mode 100644
new mode 100755
similarity index 87%
rename from packages/addons/debugging/tools/evtest/source/default.py
rename to packages/debug/evtest/install
index 8d4c5e9e96..acdfc58967
--- a/packages/addons/debugging/tools/evtest/source/default.py
+++ b/packages/debug/evtest/install
@@ -1,3 +1,5 @@
+#!/bin/sh
+
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
 #      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
@@ -18,6 +20,8 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-import os
-import sys
-import xbmcaddon
+. config/options $1
+
+mkdir -p $INSTALL/usr/bin
+  cp $PKG_BUILD/evtest $INSTALL/usr/bin
+  cp $PKG_BUILD/evtest-capture $INSTALL/usr/bin
diff --git a/packages/addons/debugging/tools/evtest/meta b/packages/debug/evtest/meta
similarity index 96%
rename from packages/addons/debugging/tools/evtest/meta
rename to packages/debug/evtest/meta
index e8d21dc5d5..fe6d691384 100644
--- a/packages/addons/debugging/tools/evtest/meta
+++ b/packages/debug/evtest/meta
@@ -32,7 +32,6 @@ 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="yes"
-PKG_ADDON_TYPE="xbmc.python.script"
+PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="yes"
diff --git a/packages/addons/debugging/tools/evtest/patches/evtest-1.30-automake_1.13.patch b/packages/debug/evtest/patches/evtest-1.30-automake_1.13.patch
similarity index 100%
rename from packages/addons/debugging/tools/evtest/patches/evtest-1.30-automake_1.13.patch
rename to packages/debug/evtest/patches/evtest-1.30-automake_1.13.patch
diff --git a/packages/debug/meta b/packages/debug/meta
index 8b19cffafd..d7baf36dee 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 gdb hddtemp i2c-tools pmtools powertop strace"
+PKG_DEPENDS="acpica cpuid dmidecode evtest gdb hddtemp i2c-tools pmtools powertop strace"
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="debug"