diff --git a/packages/addons/downloadmanager/SABnzbd/addon b/packages/addons/downloadmanager/SABnzbd/addon
new file mode 100755
index 0000000000..e66733427a
--- /dev/null
+++ b/packages/addons/downloadmanager/SABnzbd/addon
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/$1
+  cp -PR $PKG_BUILD/* $ADDON_BUILD/$PKG_ADDON_ID/$1
+
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp $BUILD/par2cmdline*/par2 $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp $BUILD/unrar/unrar $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp $BUILD/unzip*/unzip $ADDON_BUILD/$PKG_ADDON_ID/bin
+
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/pylib
+  cp -R $BUILD/Cheetah*/.install/usr/lib/python*/site-packages/* $ADDON_BUILD/$PKG_ADDON_ID/pylib
+  cp -R $BUILD/pyOpenSSL*/.install/usr/lib/python*/site-packages/* $ADDON_BUILD/$PKG_ADDON_ID/pylib
+  cp -R $BUILD/yenc*/.install/usr/lib/python*/site-packages/* $ADDON_BUILD/$PKG_ADDON_ID/pylib
diff --git a/packages/addons/downloadmanager/SABnzbd/changelog.txt b/packages/addons/downloadmanager/SABnzbd/changelog.txt
new file mode 100644
index 0000000000..86e63d6a63
--- /dev/null
+++ b/packages/addons/downloadmanager/SABnzbd/changelog.txt
@@ -0,0 +1,2 @@
+0.99.1
+- initial version SABnzbd-0.6.0RC2
\ No newline at end of file
diff --git a/packages/addons/downloadmanager/SABnzbd/icon/icon.png b/packages/addons/downloadmanager/SABnzbd/icon/icon.png
new file mode 100644
index 0000000000..2c62900063
Binary files /dev/null and b/packages/addons/downloadmanager/SABnzbd/icon/icon.png differ
diff --git a/packages/downloadmanager/SABnzbd/init.d/57_SABnzbd b/packages/addons/downloadmanager/SABnzbd/init.d/57_SABnzbd
similarity index 100%
rename from packages/downloadmanager/SABnzbd/init.d/57_SABnzbd
rename to packages/addons/downloadmanager/SABnzbd/init.d/57_SABnzbd
diff --git a/packages/downloadmanager/SABnzbd/meta b/packages/addons/downloadmanager/SABnzbd/meta
similarity index 91%
rename from packages/downloadmanager/SABnzbd/meta
rename to packages/addons/downloadmanager/SABnzbd/meta
index 28c59da0c0..5ba1ae8918 100644
--- a/packages/downloadmanager/SABnzbd/meta
+++ b/packages/addons/downloadmanager/SABnzbd/meta
@@ -27,11 +27,13 @@ PKG_SITE="http://sabnzbd.org/"
 #PKG_URL="$SOURCEFORGE_SRC/sabnzbdplus/${PKG_NAME}-${PKG_VERSION}-src.tar.gz"
 PKG_URL="$SOURCEFORGE_SRC/sabnzbdplus/sabnzbdplus-beta/sabnzbd-${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}-src.tar.gz"
 PKG_DEPENDS="Python Cheetah pyOpenSSL yenc unrar unzip par2cmdline"
-PKG_BUILD_DEPENDS="toolchain Python"
+PKG_BUILD_DEPENDS="toolchain Python Cheetah pyOpenSSL yenc unrar unzip par2cmdline"
 PKG_PRIORITY="optional"
-PKG_SECTION="plugins"
+PKG_SECTION="downloadmanager"
 PKG_SHORTDESC="SABnzbd makes Usenet as simple and streamlined as possible by automating everything we can."
 PKG_LONGDESC="SABnzbd makes Usenet as simple and streamlined as possible by automating everything we can. All you have to do is add a .nzb file. SABnzbd+ takes over from there, where it will be automatically downloaded, verified, repaired, extracted and filed away with zero human interaction."
-PKG_IS_ADDON="no"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.service"
 
 PKG_AUTORECONF="no"
diff --git a/packages/downloadmanager/SABnzbd/patches/SABnzbd-0.6.0RC2-001_defaults-0.1.patch b/packages/addons/downloadmanager/SABnzbd/patches/SABnzbd-0.6.0RC2-001_defaults-0.1.patch
similarity index 100%
rename from packages/downloadmanager/SABnzbd/patches/SABnzbd-0.6.0RC2-001_defaults-0.1.patch
rename to packages/addons/downloadmanager/SABnzbd/patches/SABnzbd-0.6.0RC2-001_defaults-0.1.patch
diff --git a/packages/downloadmanager/SABnzbd/patches/SABnzbd-0.6.0RC2-002-remove_host_settings-0.1.patch b/packages/addons/downloadmanager/SABnzbd/patches/SABnzbd-0.6.0RC2-002-remove_host_settings-0.1.patch
similarity index 100%
rename from packages/downloadmanager/SABnzbd/patches/SABnzbd-0.6.0RC2-002-remove_host_settings-0.1.patch
rename to packages/addons/downloadmanager/SABnzbd/patches/SABnzbd-0.6.0RC2-002-remove_host_settings-0.1.patch
diff --git a/packages/downloadmanager/SABnzbd/install b/packages/addons/downloadmanager/SABnzbd/source/default.py
old mode 100755
new mode 100644
similarity index 78%
rename from packages/downloadmanager/SABnzbd/install
rename to packages/addons/downloadmanager/SABnzbd/source/default.py
index e79958fbdd..5f07881ccc
--- a/packages/downloadmanager/SABnzbd/install
+++ b/packages/addons/downloadmanager/SABnzbd/source/default.py
@@ -1,5 +1,3 @@
-#!/bin/sh
-
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
 #      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
@@ -20,11 +18,9 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-. config/options $1
+import sys
+import xbmcaddon
+import os
 
-mkdir -p $INSTALL/usr/lib/$1
-  cp -PR $PKG_BUILD/* $INSTALL/usr/lib/$1
-
-mkdir -p $INSTALL/etc/avahi/services
-  cp $PKG_DIR/config/sabnzbd-http.service $INSTALL/etc/avahi/services
-  cp $PKG_DIR/config/sabnzbd-https.service $INSTALL/etc/avahi/services
+if ( __name__ == "__main__" ):
+    os.system("sh start.sh")
diff --git a/packages/addons/downloadmanager/SABnzbd/source/resources/language/Dutch/strings.xml b/packages/addons/downloadmanager/SABnzbd/source/resources/language/Dutch/strings.xml
new file mode 100644
index 0000000000..d8c05619fc
--- /dev/null
+++ b/packages/addons/downloadmanager/SABnzbd/source/resources/language/Dutch/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+
+	<!-- SABnzbd -->
+	<string id="1000">SABnzbd</string>
+	<string id="1010">Gebruikers instellingen</string>
+	<string id="1021">Gebruik verificatie</string>
+	<string id="1022">Gebruikersnaam</string>
+	<string id="1023">Wachtwoord</string>
+	<string id="2010">Netwerk instellingen</string>
+	<string id="2021">Toegestane IP adressen</string>
+
+</strings>
diff --git a/packages/addons/downloadmanager/SABnzbd/source/resources/language/English/strings.xml b/packages/addons/downloadmanager/SABnzbd/source/resources/language/English/strings.xml
new file mode 100644
index 0000000000..af7ad16aff
--- /dev/null
+++ b/packages/addons/downloadmanager/SABnzbd/source/resources/language/English/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+
+	<!-- SABnzbd -->
+	<string id="1000">SABnzbd</string>
+	<string id="1010">User Settings</string>
+	<string id="1021">Use authentification</string>
+	<string id="1022">Username</string>
+	<string id="1023">Password</string>
+	<string id="2010">Network Settings</string>
+	<string id="2021">Allowed IP addresses</string>
+
+</strings>
diff --git a/packages/addons/downloadmanager/SABnzbd/source/resources/language/French/strings.xml b/packages/addons/downloadmanager/SABnzbd/source/resources/language/French/strings.xml
new file mode 100644
index 0000000000..8f43dc8e2d
--- /dev/null
+++ b/packages/addons/downloadmanager/SABnzbd/source/resources/language/French/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+
+	<!-- SABnzbd -->
+	<string id="1000">SABnzbd</string>
+	<string id="1010">Préférences utilisateur</string>
+	<string id="1021">Utiliser une authentification</string>
+	<string id="1022">Nom d'utilisateur</string>
+	<string id="1023">Mot de passe</string>
+	<string id="2010">Préférences réseau</string>
+	<string id="2021">Adresses IP autorisées</string>
+
+</strings>
diff --git a/packages/addons/downloadmanager/SABnzbd/source/resources/language/German/strings.xml b/packages/addons/downloadmanager/SABnzbd/source/resources/language/German/strings.xml
new file mode 100644
index 0000000000..99cf2a8618
--- /dev/null
+++ b/packages/addons/downloadmanager/SABnzbd/source/resources/language/German/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+
+	<!-- SABnzbd -->
+	<string id="1000">SABnzbd</string>
+	<string id="1010">Benutzer Einstellungen</string>
+	<string id="1021">Authentifizierung verwenden</string>
+	<string id="1022">Benutzername</string>
+	<string id="1023">Passwort</string>
+	<string id="2010">Netzwerk Einstellungen</string>
+	<string id="2021">Erlaubte IP Adressen</string>
+
+</strings>
diff --git a/packages/addons/downloadmanager/SABnzbd/source/resources/language/Norwegian/strings.xml b/packages/addons/downloadmanager/SABnzbd/source/resources/language/Norwegian/strings.xml
new file mode 100644
index 0000000000..390240a437
--- /dev/null
+++ b/packages/addons/downloadmanager/SABnzbd/source/resources/language/Norwegian/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+
+	<!-- SABnzbd -->
+	<string id="1000">SABnzbd</string>
+	<string id="1010">Bruker Instillinger</string>
+	<string id="1021">Bruk inlogging</string>
+	<string id="1022">Brukernavn</string>
+	<string id="1023">Passord</string>
+	<string id="2010">Nettverksinstillinger</string>
+	<string id="2021">Tilatte IP addresser</string>
+
+</strings>
diff --git a/packages/addons/downloadmanager/SABnzbd/source/resources/settings.xml b/packages/addons/downloadmanager/SABnzbd/source/resources/settings.xml
new file mode 100644
index 0000000000..a9e6b7f346
--- /dev/null
+++ b/packages/addons/downloadmanager/SABnzbd/source/resources/settings.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<settings>
+
+   <!-- SABnzbd -->
+    <category label="1000">
+		<setting label="1010" type="lsep"/>
+		<setting type="sep" />
+		<setting id="SABNZBD_AUTH" type="bool" label="1021" default="false" />
+		<setting id="SABNZBD_USER" type="text" label="1022" default="openelec" enable="eq(-1,true)"/>
+		<setting id="SABNZBD_PWD" type="text" label="1023" default="openelec" enable="eq(-2,true)"/>
+
+		<setting label="2010" type="lsep"/>
+		<setting type="sep" />
+		<setting id="SABNZBD_IP" type="text" label="2021" default="0.0.0.0"/>
+    </category>
+</settings>
diff --git a/packages/addons/downloadmanager/SABnzbd/source/start.sh b/packages/addons/downloadmanager/SABnzbd/source/start.sh
new file mode 100755
index 0000000000..381c4a913d
--- /dev/null
+++ b/packages/addons/downloadmanager/SABnzbd/source/start.sh
@@ -0,0 +1,65 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+export PATH="$PATH:./bin"
+export PYTHONPATH="$PYTHONPATH:./pylib"
+
+SABNZBD_HOME="$HOME/.xbmc/userdata/addon_data/addon.downloadmanager.SABnzbd"
+SABNZBD_SETTINGS="$SABNZBD_HOME/settings.xml"
+
+mkdir -p $SABNZBD_HOME
+
+# if [ ! -f "$SABNZBD_SETTINGS" ]; then
+#   cp settings.xml $SABNZBD_SETTINGS
+# fi
+
+mkdir -p /storage/downloads
+mkdir -p /storage/downloads/incoming
+mkdir -p /storage/downloads/watch
+
+# TRANSMISSION_START=`grep TRANSMISSION_START $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
+# TRANSMISSION_AUTH=`grep TRANSMISSION_AUTH $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
+# TRANSMISSION_USER=`grep TRANSMISSION_USER $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
+# TRANSMISSION_PWD=`grep TRANSMISSION_PWD $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
+# TRANSMISSION_IP=`grep TRANSMISSION_IP $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
+
+# if [ -z "$TRANSMISSION_IP" ]; then
+#   TRANSMISSION_IP="*.*.*.*"
+# fi
+
+# TRANSMISSION_ARG="$TRANSMISSION_ARG -w /storage/downloads"
+# TRANSMISSION_ARG="$TRANSMISSION_ARG --incomplete-dir /storage/downloads/incoming"
+# TRANSMISSION_ARG="$TRANSMISSION_ARG --watch-dir /storage/downloads/watch"
+# TRANSMISSION_ARG="$TRANSMISSION_ARG -e /var/log/transmission.log"
+# TRANSMISSION_ARG="$TRANSMISSION_ARG -g /storage/.cache/transmission"
+# TRANSMISSION_ARG="$TRANSMISSION_ARG -a $TRANSMISSION_IP"
+
+# if [ "$TRANSMISSION_AUTH" = "true" ]; then
+#   TRANSMISSION_ARG="$TRANSMISSION_ARG -t"
+#   TRANSMISSION_ARG="$TRANSMISSION_ARG -u $TRANSMISSION_USER"
+#   TRANSMISSION_ARG="$TRANSMISSION_ARG -v $TRANSMISSION_PWD"
+# else
+#   TRANSMISSION_ARG="$TRANSMISSION_ARG -T"
+# fi
+
+chmod +x ./bin/*
+python ./SABnzbd/SABnzbd.py -d -f $SABNZBD_HOME/sabnzbd.conf -l 0 > /dev/null 2>&1
diff --git a/packages/downloadmanager/SABnzbd/config/sabnzbd-http.service b/packages/downloadmanager/SABnzbd/config/sabnzbd-http.service
deleted file mode 100644
index c2f0b6b646..0000000000
--- a/packages/downloadmanager/SABnzbd/config/sabnzbd-http.service
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" standalone='no'?><!--*-nxml-*-->
-<!DOCTYPE service-group SYSTEM "avahi-service.dtd">
-<service-group>
- <name replace-wildcards="yes">SABnzbd Server on %h</name>
-  <service>
-   <type>_http._tcp</type>
-   <port>8081</port>
-   <txt-record>path=/index.html</txt-record>
-  </service>
-</service-group>
diff --git a/packages/downloadmanager/SABnzbd/config/sabnzbd-https.service b/packages/downloadmanager/SABnzbd/config/sabnzbd-https.service
deleted file mode 100644
index 97fae992f0..0000000000
--- a/packages/downloadmanager/SABnzbd/config/sabnzbd-https.service
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" standalone='no'?><!--*-nxml-*-->
-<!DOCTYPE service-group SYSTEM "avahi-service.dtd">
-<service-group>
- <name replace-wildcards="yes">SABnzbd Server on %h (secured)</name>
-  <service>
-   <type>_http._tcp</type>
-   <port>8082</port>
-   <txt-record>path=/index.html</txt-record>
-  </service>
-</service-group>
diff --git a/projects/ATV/options b/projects/ATV/options
index d9f43c0706..bdac4c2f3f 100644
--- a/projects/ATV/options
+++ b/projects/ATV/options
@@ -141,9 +141,6 @@
 # build and install Samba Server (yes / no)
   SAMBA_SERVER="yes"
 
-# build and install SABnzbd Newsgroup downloader daemon (yes / no)
-  SABNZBD="no"
-
 # build and install some tools for including in release (yes / no)
 # some of this tools are: htop, nano, wgetpaste
   TOOLS="yes"
diff --git a/projects/Generic/options b/projects/Generic/options
index 1d545db33c..65d3cd34c0 100644
--- a/projects/Generic/options
+++ b/projects/Generic/options
@@ -141,9 +141,6 @@
 # build and install Samba Server (yes / no)
   SAMBA_SERVER="yes"
 
-# build and install SABnzbd Newsgroup downloader daemon (yes / no)
-  SABNZBD="yes"
-
 # build and install some tools for including in release (yes / no)
 # some of this tools are: htop, nano, wgetpaste
   TOOLS="yes"
diff --git a/projects/ION/options b/projects/ION/options
index 8aa49adb2e..cc351095ce 100644
--- a/projects/ION/options
+++ b/projects/ION/options
@@ -141,9 +141,6 @@
 # build and install Samba Server (yes / no)
   SAMBA_SERVER="yes"
 
-# build and install SABnzbd Newsgroup downloader daemon (yes / no)
-  SABNZBD="yes"
-
 # build and install some tools for including in release (yes / no)
 # some of this tools are: htop, nano, wgetpaste
   TOOLS="yes"
diff --git a/projects/Intel/options b/projects/Intel/options
index b87f8f8ebe..6c3b551734 100644
--- a/projects/Intel/options
+++ b/projects/Intel/options
@@ -141,9 +141,6 @@
 # build and install Samba Server (yes / no)
   SAMBA_SERVER="yes"
 
-# build and install SABnzbd Newsgroup downloader daemon (yes / no)
-  SABNZBD="yes"
-
 # build and install some tools for including in release (yes / no)
 # some of this tools are: htop, nano, wgetpaste
   TOOLS="yes"
diff --git a/scripts/image b/scripts/image
index 3e5cf4e7b8..1695a26624 100755
--- a/scripts/image
+++ b/scripts/image
@@ -95,10 +95,6 @@ mkdir -p $INSTALL
 # Network support
   [ "$NETWORK" = "yes" ] && $SCRIPTS/install network
 
-# SABnzbd support
-  [ "$SABNZBD" = "yes" ] && $SCRIPTS/install SABnzbd
-  [ "$SABNZBD" = "yes" ] && $SCRIPTS/install Sick-Beard
-
 # Graphic support
   [ ! "$DISPLAYSERVER" = "no" ] && $SCRIPTS/install $DISPLAYSERVER