diff --git a/packages/3rdparty/multimedia/w_scan/install b/packages/addons/multimedia/w_scan/addon
similarity index 91%
rename from packages/3rdparty/multimedia/w_scan/install
rename to packages/addons/multimedia/w_scan/addon
index 91c9f1ad7a..7c5afeecc7 100755
--- a/packages/3rdparty/multimedia/w_scan/install
+++ b/packages/addons/multimedia/w_scan/addon
@@ -22,6 +22,5 @@
 
 . config/options
 
-mkdir -p $INSTALL/usr/bin
-  cp -P $PKG_BUILD/w_scan $INSTALL/usr/bin
-
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp $PKG_BUILD/w_scan $ADDON_BUILD/$PKG_ADDON_ID/bin
diff --git a/packages/3rdparty/multimedia/w_scan/build b/packages/addons/multimedia/w_scan/build
similarity index 100%
rename from packages/3rdparty/multimedia/w_scan/build
rename to packages/addons/multimedia/w_scan/build
diff --git a/packages/addons/multimedia/w_scan/changelog.txt b/packages/addons/multimedia/w_scan/changelog.txt
new file mode 100644
index 0000000000..0d32bce4a7
--- /dev/null
+++ b/packages/addons/multimedia/w_scan/changelog.txt
@@ -0,0 +1,2 @@
+2.0.0
+- initial addon w_scan based on version 20120128
diff --git a/packages/addons/multimedia/w_scan/icon/icon.png b/packages/addons/multimedia/w_scan/icon/icon.png
new file mode 100644
index 0000000000..ba5c9edd14
Binary files /dev/null and b/packages/addons/multimedia/w_scan/icon/icon.png differ
diff --git a/packages/3rdparty/multimedia/w_scan/meta b/packages/addons/multimedia/w_scan/meta
similarity index 91%
rename from packages/3rdparty/multimedia/w_scan/meta
rename to packages/addons/multimedia/w_scan/meta
index 227339389f..bca708f3cd 100644
--- a/packages/3rdparty/multimedia/w_scan/meta
+++ b/packages/addons/multimedia/w_scan/meta
@@ -19,18 +19,18 @@
 ################################################################################
 
 PKG_NAME="w_scan"
-PKG_VERSION="20120112"
-PKG_REV="1"
+PKG_VERSION="20120128"
+PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://wirbel.htpc-forum.de/w_scan/index2.html"
 PKG_URL="http://wirbel.htpc-forum.de/w_scan/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain"
+PKG_BUILD_DEPENDS="toolchain $ICONV"
 PKG_PRIORITY="optional"
-PKG_SECTION="debug"
+PKG_SECTION="lib/multimedia"
 PKG_SHORTDESC="w_scan: eine kleine Anwendung zum Scannen von ATSC/DVB-C/S/T Transpondern/Bouquets nach Sendern und Erstellen einer VDR channels.conf."
 PKG_LONGDESC="w_scan ist eine kleine Anwendung zum Scannen von ATSC/DVB-C/S/T Transpondern/Bouquets nach Sendern und Erstellen einer VDR channels.conf."
-PKG_IS_ADDON="no"
-
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.python.script"
 PKG_AUTORECONF="yes"
diff --git a/packages/addons/multimedia/w_scan/source/default.py b/packages/addons/multimedia/w_scan/source/default.py
new file mode 100644
index 0000000000..8d4c5e9e96
--- /dev/null
+++ b/packages/addons/multimedia/w_scan/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/addons/service/multimedia/vdr-addon/addon b/packages/addons/service/multimedia/vdr-addon/addon
index 8fb417a754..0a2858aeeb 100755
--- a/packages/addons/service/multimedia/vdr-addon/addon
+++ b/packages/addons/service/multimedia/vdr-addon/addon
@@ -56,7 +56,6 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/xvdr
 
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
   cp -P $BUILD/vdr-[0-9]*/vdr $ADDON_BUILD/$PKG_ADDON_ID/bin/vdr.bin
-  cp -P $BUILD/w_scan-[0-9]*/w_scan $ADDON_BUILD/$PKG_ADDON_ID/bin/
 
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
   cp -P $BUILD/attr-[0-9]*/libattr/.libs/*.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
diff --git a/packages/addons/service/multimedia/vdr-addon/meta b/packages/addons/service/multimedia/vdr-addon/meta
index 81b903b8bb..5a1a84a293 100755
--- a/packages/addons/service/multimedia/vdr-addon/meta
+++ b/packages/addons/service/multimedia/vdr-addon/meta
@@ -27,7 +27,7 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain attr libcap vdr vdr-plugin-xvdr vdr-iptv vdr-wirbelscan vdr-sc vdr-plugin-dvbapi vdr-dynamite w_scan vdr-plugin-streamdev"
+PKG_BUILD_DEPENDS="toolchain attr libcap vdr vdr-plugin-xvdr vdr-iptv vdr-wirbelscan vdr-sc vdr-plugin-dvbapi vdr-dynamite vdr-plugin-streamdev"
 PKG_PRIORITY="optional"
 PKG_SECTION="service.multimedia"
 PKG_SHORTDESC="vdr: A powerful DVB TV application"