diff --git a/packages/addons/networking/testing/iperf/changelog.txt b/packages/addons/networking/testing/iperf/changelog.txt
deleted file mode 100644
index 353ab309e7..0000000000
--- a/packages/addons/networking/testing/iperf/changelog.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-3.0.1
-- bump addon version
-
-2.1.1
-- initial addon based on iperf-2.0.5
diff --git a/packages/addons/networking/testing/iperf/icon/icon.png b/packages/addons/networking/testing/iperf/icon/icon.png
deleted file mode 100644
index 9f8063f885..0000000000
Binary files a/packages/addons/networking/testing/iperf/icon/icon.png and /dev/null differ
diff --git a/packages/addons/networking/testing/iperf/source/default.py b/packages/addons/networking/testing/iperf/source/default.py
deleted file mode 100644
index 8d4c5e9e96..0000000000
--- a/packages/addons/networking/testing/iperf/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/networking/testing/iperf/build b/packages/debug/iperf/build
similarity index 100%
rename from packages/addons/networking/testing/iperf/build
rename to packages/debug/iperf/build
diff --git a/packages/addons/networking/testing/iperf/addon b/packages/debug/iperf/install
similarity index 91%
rename from packages/addons/networking/testing/iperf/addon
rename to packages/debug/iperf/install
index cade4ce551..784de83914 100755
--- a/packages/addons/networking/testing/iperf/addon
+++ b/packages/debug/iperf/install
@@ -22,5 +22,5 @@
 
 . config/options $1
 
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp $PKG_BUILD/src/iperf $ADDON_BUILD/$PKG_ADDON_ID/bin
+mkdir -p $INSTALL/usr/bin/
+  cp $PKG_BUILD/src/iperf $INSTALL/usr/bin
diff --git a/packages/addons/networking/testing/iperf/meta b/packages/debug/iperf/meta
similarity index 95%
rename from packages/addons/networking/testing/iperf/meta
rename to packages/debug/iperf/meta
index e8726f04bd..7ce5def105 100644
--- a/packages/addons/networking/testing/iperf/meta
+++ b/packages/debug/iperf/meta
@@ -28,11 +28,10 @@ PKG_URL="$SOURCEFORGE_SRC/iperf/files/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain $ICONV"
 PKG_PRIORITY="optional"
-PKG_SECTION="network/testing"
+PKG_SECTION="debug/tools"
 PKG_SHORTDESC="iperf: A modern alternative for measuring maximum TCP and UDP bandwidth performance"
 PKG_LONGDESC="Iperf was developed by NLANR/DAST as a modern alternative for measuring maximum TCP and UDP bandwidth performance. Iperf allows the tuning of various parameters and UDP characteristics. Iperf reports bandwidth, delay jitter, datagram loss."
 
-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 89e78eaf05..99b211cea6 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 dstat evtest gdb hddtemp htop i2c-tools iftop pmtools powertop smem strace wireless_tools tcpdump"
+PKG_DEPENDS="acpica cpuid dmidecode dstat evtest gdb hddtemp htop i2c-tools iftop pmtools powertop smem strace wireless_tools tcpdump iperf"
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="debug"