diff --git a/packages/addons/debug/tools/evtest/addon b/packages/addons/debug/tools/evtest/addon
new file mode 100755
index 0000000000..62520bc825
--- /dev/null
+++ b/packages/addons/debug/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/debug/tools/evtest/build
similarity index 93%
rename from packages/tools/evtest/build
rename to packages/addons/debug/tools/evtest/build
index 5559e24e5b..d93dcff91b 100755
--- a/packages/tools/evtest/build
+++ b/packages/addons/debug/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/debug/tools/evtest/changelog.txt b/packages/addons/debug/tools/evtest/changelog.txt
new file mode 100644
index 0000000000..365ebdd2e2
--- /dev/null
+++ b/packages/addons/debug/tools/evtest/changelog.txt
@@ -0,0 +1,2 @@
+0.99.1
+- initial addon based on evtest-1.27
diff --git a/packages/addons/debug/tools/evtest/icon/icon.png b/packages/addons/debug/tools/evtest/icon/icon.png
new file mode 100644
index 0000000000..c1cc6c21a3
Binary files /dev/null and b/packages/addons/debug/tools/evtest/icon/icon.png differ
diff --git a/packages/tools/evtest/meta b/packages/addons/debug/tools/evtest/meta
similarity index 94%
rename from packages/tools/evtest/meta
rename to packages/addons/debug/tools/evtest/meta
index fcee5b0945..ce5e1dc402 100644
--- a/packages/tools/evtest/meta
+++ b/packages/addons/debug/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/tools/evtest/install b/packages/addons/debug/tools/evtest/source/default.py
old mode 100755
new mode 100644
similarity index 87%
rename from packages/tools/evtest/install
rename to packages/addons/debug/tools/evtest/source/default.py
index afab86665b..2085a1f96d
--- a/packages/tools/evtest/install
+++ b/packages/addons/debug/tools/evtest/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,8 +18,6 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-. config/options $1
-
-mkdir -p $INSTALL/usr/bin
-  cp $PKG_BUILD/evtest $INSTALL/usr/bin
-  cp $PKG_BUILD/evtest-capture $INSTALL/usr/bin
+import os
+import sys
+import xbmcaddon