diff --git a/packages/addons/networking/analyzer/tcpdump/changelog.txt b/packages/addons/networking/analyzer/tcpdump/changelog.txt
deleted file mode 100644
index 18432df6cf..0000000000
--- a/packages/addons/networking/analyzer/tcpdump/changelog.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-3.0.1
-- bump addon version
-
-2.1.3
-- updated to tcpdump-4.3.0
-- updated to libpcap-1.3.0
-
-2.1.2
-- rebuild
-
-2.1.1
-- initial addon based on tcpdump-4.1.1
diff --git a/packages/addons/networking/analyzer/tcpdump/icon/icon.png b/packages/addons/networking/analyzer/tcpdump/icon/icon.png
deleted file mode 100644
index b369966677..0000000000
Binary files a/packages/addons/networking/analyzer/tcpdump/icon/icon.png and /dev/null differ
diff --git a/packages/addons/networking/analyzer/tcpdump/source/default.py b/packages/addons/networking/analyzer/tcpdump/source/default.py
deleted file mode 100644
index 8d4c5e9e96..0000000000
--- a/packages/addons/networking/analyzer/tcpdump/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/debug/meta b/packages/debug/meta
index 45538f7df7..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"
+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"
diff --git a/packages/addons/networking/analyzer/tcpdump/build b/packages/network/tcpdump/build
similarity index 100%
rename from packages/addons/networking/analyzer/tcpdump/build
rename to packages/network/tcpdump/build
diff --git a/packages/addons/networking/analyzer/tcpdump/addon b/packages/network/tcpdump/install
similarity index 91%
rename from packages/addons/networking/analyzer/tcpdump/addon
rename to packages/network/tcpdump/install
index 3d36c9fa9d..677d4d5435 100755
--- a/packages/addons/networking/analyzer/tcpdump/addon
+++ b/packages/network/tcpdump/install
@@ -22,5 +22,6 @@
 
 . config/options $1
 
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp $PKG_BUILD/tcpdump $ADDON_BUILD/$PKG_ADDON_ID/bin
+mkdir -p $INSTALL/usr/sbin
+  cp -P $PKG_BUILD/tcpdump $INSTALL/usr/sbin
+
diff --git a/packages/addons/networking/analyzer/tcpdump/meta b/packages/network/tcpdump/meta
similarity index 94%
rename from packages/addons/networking/analyzer/tcpdump/meta
rename to packages/network/tcpdump/meta
index d26a9ba446..ff8e396fe9 100644
--- a/packages/addons/networking/analyzer/tcpdump/meta
+++ b/packages/network/tcpdump/meta
@@ -27,11 +27,9 @@ PKG_URL="http://www.tcpdump.org/release/tcpdump-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain libpcap"
 PKG_PRIORITY=optional
-PKG_SECTION="network/analyzer"
+PKG_SECTION="network"
 PKG_SHORTDESC="powerful tool for network monitoring and data acquisition"
 PKG_LONGDESC="This program allows you to dump the traffic on a network. tcpdump is able to examine IPv4, ICMPv4, IPv6, ICMPv6, UDP, TCP, SNMP, AFS BGP, RIP, PIM, DVMRP, IGMP, SMB, OSPF, NFS and many other packet types."
-
-PKG_IS_ADDON="yes"
-PKG_ADDON_TYPE="xbmc.python.script"
+PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="yes"