diff --git a/packages/addons/tools/strace/changelog.txt b/packages/addons/tools/strace/changelog.txt
new file mode 100644
index 0000000000..908a9a542b
--- /dev/null
+++ b/packages/addons/tools/strace/changelog.txt
@@ -0,0 +1,2 @@
+4.1.1
+- initial release
diff --git a/packages/addons/tools/strace/icon/icon.png b/packages/addons/tools/strace/icon/icon.png
new file mode 100644
index 0000000000..a712c98d0f
Binary files /dev/null and b/packages/addons/tools/strace/icon/icon.png differ
diff --git a/packages/debug/strace/package.mk b/packages/addons/tools/strace/package.mk
similarity index 86%
rename from packages/debug/strace/package.mk
rename to packages/addons/tools/strace/package.mk
index fcdb1f65d7..a358ec7f09 100644
--- a/packages/debug/strace/package.mk
+++ b/packages/addons/tools/strace/package.mk
@@ -25,14 +25,20 @@ PKG_SITE="http://sourceforge.net/projects/strace/"
 PKG_URL="$SOURCEFORGE_SRC/strace/strace/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_PRIORITY="optional"
-PKG_SECTION="debug"
+PKG_SECTION="tools"
 PKG_SHORTDESC="strace: Trace system calls and signals"
 PKG_LONGDESC="In the simplest case strace runs the specified command until it exits. It intercepts and records the system calls which are called by a process and the signals which are received by a process. The name of each system call, its arguments and its return value are printed on standard error or to the file specified with the -o option."
 
-PKG_IS_ADDON="no"
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.python.script"
+
 PKG_AUTORECONF="yes"
 
-post_makeinstall_target() {
-  rm -rf $INSTALL/usr/bin/strace-graph
-  rm -rf $INSTALL/usr/bin/strace-log-merge
+makeinstall_target() {
+  : # nothing to do here
+}
+
+addon() {
+  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp -P $PKG_BUILD/.$TARGET_NAME/strace $ADDON_BUILD/$PKG_ADDON_ID/bin
 }
diff --git a/packages/debug/strace/patches/strace-4.8-autoreconf.patch b/packages/addons/tools/strace/patches/strace-4.8-autoreconf.patch
similarity index 100%
rename from packages/debug/strace/patches/strace-4.8-autoreconf.patch
rename to packages/addons/tools/strace/patches/strace-4.8-autoreconf.patch
diff --git a/packages/debug/strace/patches/strace-fix-ptrace_peeksiginfo_args.patch b/packages/addons/tools/strace/patches/strace-fix-ptrace_peeksiginfo_args.patch
similarity index 100%
rename from packages/debug/strace/patches/strace-fix-ptrace_peeksiginfo_args.patch
rename to packages/addons/tools/strace/patches/strace-fix-ptrace_peeksiginfo_args.patch
diff --git a/packages/addons/tools/strace/source/default.py b/packages/addons/tools/strace/source/default.py
new file mode 100644
index 0000000000..cd40a7231e
--- /dev/null
+++ b/packages/addons/tools/strace/source/default.py
@@ -0,0 +1,17 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#
+#  OpenELEC 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 of the License, or
+#  (at your option) any later version.
+#
+#  OpenELEC 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.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
diff --git a/packages/debug/package.mk b/packages/debug/package.mk
index dbd76c494f..7f5b34253e 100644
--- a/packages/debug/package.mk
+++ b/packages/debug/package.mk
@@ -23,7 +23,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
-PKG_DEPENDS_TARGET="toolchain gdb strace"
+PKG_DEPENDS_TARGET="toolchain gdb"
 PKG_PRIORITY="optional"
 PKG_SECTION="virtual"
 PKG_SHORTDESC="debug: Metapackage for installing debugging tools"