diff --git a/packages/addons/service/downloadmanager/SABnzbd/addon b/packages/addons/service/downloadmanager/SABnzbd/addon
new file mode 100755
index 0000000000..88dd090e00
--- /dev/null
+++ b/packages/addons/service/downloadmanager/SABnzbd/addon
@@ -0,0 +1,37 @@
+#!/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
+ cp -PR $PKG_DIR/config/settings.xml* $ADDON_BUILD/$PKG_ADDON_ID/settings-default.xml
+
+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/service/downloadmanager/SABnzbd/changelog.txt b/packages/addons/service/downloadmanager/SABnzbd/changelog.txt
new file mode 100644
index 0000000000..2703b7f6db
--- /dev/null
+++ b/packages/addons/service/downloadmanager/SABnzbd/changelog.txt
@@ -0,0 +1,6 @@
+0.99.2
+- update to SABnzbd-0.6.1
+- rework addon
+
+0.99.1
+- initial version SABnzbd-0.6.0RC2
diff --git a/packages/addons/service/downloadmanager/SABnzbd/config/settings.xml b/packages/addons/service/downloadmanager/SABnzbd/config/settings.xml
new file mode 100644
index 0000000000..20c2a69b4e
--- /dev/null
+++ b/packages/addons/service/downloadmanager/SABnzbd/config/settings.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/packages/addons/service/downloadmanager/SABnzbd/icon/icon.png b/packages/addons/service/downloadmanager/SABnzbd/icon/icon.png
new file mode 100644
index 0000000000..2c62900063
Binary files /dev/null and b/packages/addons/service/downloadmanager/SABnzbd/icon/icon.png differ
diff --git a/packages/addons/service/downloadmanager/SABnzbd/meta b/packages/addons/service/downloadmanager/SABnzbd/meta
new file mode 100644
index 0000000000..59416fecd8
--- /dev/null
+++ b/packages/addons/service/downloadmanager/SABnzbd/meta
@@ -0,0 +1,38 @@
+################################################################################
+# 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
+################################################################################
+
+PKG_NAME="SABnzbd"
+PKG_VERSION="0.6.1"
+PKG_REV="2"
+PKG_ARCH="any"
+PKG_LICENSE="OSS"
+PKG_SITE="http://sabnzbd.org/"
+PKG_URL="$SOURCEFORGE_SRC/sabnzbdplus/sabnzbdplus/sabnzbd-${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}-src.tar.gz"
+PKG_DEPENDS="Python Cheetah pyOpenSSL yenc unrar unzip par2cmdline"
+PKG_BUILD_DEPENDS="toolchain Python Cheetah pyOpenSSL yenc unrar unzip par2cmdline"
+PKG_PRIORITY="optional"
+PKG_SECTION="service/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="yes"
+PKG_ADDON_TYPE="xbmc.service"
+
+PKG_AUTORECONF="no"
diff --git a/packages/addons/service/downloadmanager/SABnzbd/patches/SABnzbd-0.6.1-001_remove_default_settings-0.2.patch b/packages/addons/service/downloadmanager/SABnzbd/patches/SABnzbd-0.6.1-001_remove_default_settings-0.2.patch
new file mode 100644
index 0000000000..cc59ea4d0f
--- /dev/null
+++ b/packages/addons/service/downloadmanager/SABnzbd/patches/SABnzbd-0.6.1-001_remove_default_settings-0.2.patch
@@ -0,0 +1,214 @@
+diff -Naur SABnzbd-0.6.1/interfaces/Plush/templates/config_directories.tmpl SABnzbd-0.6.1.patch/interfaces/Plush/templates/config_directories.tmpl
+--- SABnzbd-0.6.1/interfaces/Plush/templates/config_directories.tmpl 2011-05-15 10:44:29.000000000 +0200
++++ SABnzbd-0.6.1.patch/interfaces/Plush/templates/config_directories.tmpl 2011-05-23 20:05:59.254145174 +0200
+@@ -109,49 +109,6 @@
+
+
+
+-