diff --git a/packages/debug/iperf/install b/packages/addons/networking/testing/iperf/addon
similarity index 91%
rename from packages/debug/iperf/install
rename to packages/addons/networking/testing/iperf/addon
index 784de83914..cade4ce551 100755
--- a/packages/debug/iperf/install
+++ b/packages/addons/networking/testing/iperf/addon
@@ -22,5 +22,5 @@
 
 . config/options $1
 
-mkdir -p $INSTALL/usr/bin/
-  cp $PKG_BUILD/src/iperf $INSTALL/usr/bin
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp $PKG_BUILD/src/iperf $ADDON_BUILD/$PKG_ADDON_ID/bin
diff --git a/packages/debug/iperf/build b/packages/addons/networking/testing/iperf/build
similarity index 100%
rename from packages/debug/iperf/build
rename to packages/addons/networking/testing/iperf/build
diff --git a/packages/addons/networking/testing/iperf/changelog.txt b/packages/addons/networking/testing/iperf/changelog.txt
new file mode 100644
index 0000000000..c053248905
--- /dev/null
+++ b/packages/addons/networking/testing/iperf/changelog.txt
@@ -0,0 +1,8 @@
+3.0.2
+- rebuild
+
+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
new file mode 100644
index 0000000000..9f8063f885
Binary files /dev/null and b/packages/addons/networking/testing/iperf/icon/icon.png differ
diff --git a/packages/debug/iperf/meta b/packages/addons/networking/testing/iperf/meta
similarity index 94%
rename from packages/debug/iperf/meta
rename to packages/addons/networking/testing/iperf/meta
index 7ce5def105..848adaef78 100644
--- a/packages/debug/iperf/meta
+++ b/packages/addons/networking/testing/iperf/meta
@@ -20,7 +20,7 @@
 
 PKG_NAME="iperf"
 PKG_VERSION="2.0.5"
-PKG_REV="1"
+PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://sourceforge.net/projects/iperf/"
@@ -28,10 +28,11 @@ PKG_URL="$SOURCEFORGE_SRC/iperf/files/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain $ICONV"
 PKG_PRIORITY="optional"
-PKG_SECTION="debug/tools"
+PKG_SECTION="network/testing"
 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="no"
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.python.script"
 
 PKG_AUTORECONF="yes"
diff --git a/packages/addons/networking/testing/iperf/source/default.py b/packages/addons/networking/testing/iperf/source/default.py
new file mode 100644
index 0000000000..8d4c5e9e96
--- /dev/null
+++ b/packages/addons/networking/testing/iperf/source/default.py
@@ -0,0 +1,23 @@
+################################################################################
+#      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/debug/meta b/packages/debug/meta
index 99b211cea6..89e78eaf05 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 iperf"
+PKG_DEPENDS="acpica cpuid dmidecode dstat evtest gdb hddtemp htop i2c-tools iftop pmtools powertop smem strace wireless_tools tcpdump"
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="debug"