diff --git a/packages/addons/downloadmanager/Sick-Beard/changelog.txt b/packages/addons/downloadmanager/Sick-Beard/changelog.txt
deleted file mode 100644
index 14e6ff75b2..0000000000
--- a/packages/addons/downloadmanager/Sick-Beard/changelog.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-0.99.1
-- initial version SickBeard
diff --git a/packages/addons/downloadmanager/Sick-Beard/patches/Sick-Beard-0f076f4-002_enable_xbmc_support-0.1.patch b/packages/addons/downloadmanager/Sick-Beard/patches/Sick-Beard-0f076f4-002_enable_xbmc_support-0.1.patch
deleted file mode 100644
index f9314b3b2e..0000000000
--- a/packages/addons/downloadmanager/Sick-Beard/patches/Sick-Beard-0f076f4-002_enable_xbmc_support-0.1.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Naur Sick-Beard-0f076f4/sickbeard/__init__.py Sick-Beard-0f076f4.patch/sickbeard/__init__.py
---- Sick-Beard-0f076f4/sickbeard/__init__.py	2011-04-16 16:57:52.784398169 +0200
-+++ Sick-Beard-0f076f4.patch/sickbeard/__init__.py	2011-04-16 17:04:12.103546012 +0200
-@@ -190,12 +190,12 @@
- NZBGET_CATEGORY = None
- NZBGET_HOST = None
- 
--USE_XBMC = False
-+USE_XBMC = True
- XBMC_NOTIFY_ONSNATCH = False
- XBMC_NOTIFY_ONDOWNLOAD = False
- XBMC_UPDATE_LIBRARY = False
- XBMC_UPDATE_FULL = False
--XBMC_HOST = ''
-+XBMC_HOST = '127.0.0.1:8080'
- XBMC_USERNAME = None
- XBMC_PASSWORD = None
- 
-@@ -528,12 +528,12 @@
-         NZBGET_CATEGORY = check_setting_str(CFG, 'NZBget', 'nzbget_category', 'tv')
-         NZBGET_HOST = check_setting_str(CFG, 'NZBget', 'nzbget_host', '')
- 
--        USE_XBMC = bool(check_setting_int(CFG, 'XBMC', 'use_xbmc', 0)) 
-+        USE_XBMC = bool(check_setting_int(CFG, 'XBMC', 'use_xbmc', 1)) 
-         XBMC_NOTIFY_ONSNATCH = bool(check_setting_int(CFG, 'XBMC', 'xbmc_notify_onsnatch', 0))
-         XBMC_NOTIFY_ONDOWNLOAD = bool(check_setting_int(CFG, 'XBMC', 'xbmc_notify_ondownload', 0))
-         XBMC_UPDATE_LIBRARY = bool(check_setting_int(CFG, 'XBMC', 'xbmc_update_library', 0))
-         XBMC_UPDATE_FULL = bool(check_setting_int(CFG, 'XBMC', 'xbmc_update_full', 0))
--        XBMC_HOST = check_setting_str(CFG, 'XBMC', 'xbmc_host', '')
-+        XBMC_HOST = check_setting_str(CFG, 'XBMC', 'xbmc_host', '127.0.0.1:8080')
-         XBMC_USERNAME = check_setting_str(CFG, 'XBMC', 'xbmc_username', '')
-         XBMC_PASSWORD = check_setting_str(CFG, 'XBMC', 'xbmc_password', '')
- 
diff --git a/packages/addons/downloadmanager/Sick-Beard/patches/Sick-Beard-0f076f4-005_setup_SABnzbd_host-0.1.patch b/packages/addons/downloadmanager/Sick-Beard/patches/Sick-Beard-0f076f4-005_setup_SABnzbd_host-0.1.patch
deleted file mode 100644
index 009a6c380c..0000000000
--- a/packages/addons/downloadmanager/Sick-Beard/patches/Sick-Beard-0f076f4-005_setup_SABnzbd_host-0.1.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur Sick-Beard-0f076f4/sickbeard/__init__.py Sick-Beard-0f076f4.patch/sickbeard/__init__.py
---- Sick-Beard-0f076f4/sickbeard/__init__.py	2011-04-16 22:38:48.449071968 +0200
-+++ Sick-Beard-0f076f4.patch/sickbeard/__init__.py	2011-04-16 22:52:23.704291427 +0200
-@@ -184,7 +184,7 @@
- SAB_PASSWORD = None
- SAB_APIKEY = None
- SAB_CATEGORY = None
--SAB_HOST = ''
-+SAB_HOST = '127.0.0.1:8081'
- 
- NZBGET_PASSWORD = None
- NZBGET_CATEGORY = None
-@@ -522,7 +522,7 @@
-         SAB_PASSWORD = check_setting_str(CFG, 'SABnzbd', 'sab_password', '')
-         SAB_APIKEY = check_setting_str(CFG, 'SABnzbd', 'sab_apikey', '')
-         SAB_CATEGORY = check_setting_str(CFG, 'SABnzbd', 'sab_category', 'tv')
--        SAB_HOST = check_setting_str(CFG, 'SABnzbd', 'sab_host', '')
-+        SAB_HOST = check_setting_str(CFG, 'SABnzbd', 'sab_host', '127.0.0.1:8081')
- 
-         NZBGET_PASSWORD = check_setting_str(CFG, 'NZBget', 'nzbget_password', 'tegbzn6789')
-         NZBGET_CATEGORY = check_setting_str(CFG, 'NZBget', 'nzbget_category', 'tv')
diff --git a/packages/addons/downloadmanager/Sick-Beard/patches/Sick-Beard-0f076f4-rm_branding.patch b/packages/addons/downloadmanager/Sick-Beard/patches/Sick-Beard-0f076f4-rm_branding.patch
deleted file mode 100644
index 5fa2b0e0fb..0000000000
--- a/packages/addons/downloadmanager/Sick-Beard/patches/Sick-Beard-0f076f4-rm_branding.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 37d652f9f5fc55fa85050fbf11e81fb2145a78aa Mon Sep 17 00:00:00 2001
-From: Anthony Nash <nash.ant@gmail.com>
-Date: Thu, 21 Apr 2011 00:12:03 +0100
-Subject: [PATCH 2/2] rm_branding
-
----
- data/interfaces/default/config.tmpl  |   13 +++----------
- data/interfaces/default/inc_top.tmpl |   14 --------------
- 2 files changed, 3 insertions(+), 24 deletions(-)
-
-diff --git a/data/interfaces/default/config.tmpl b/data/interfaces/default/config.tmpl
-index 543b2ff..aaea9b8 100644
---- a/data/interfaces/default/config.tmpl
-+++ b/data/interfaces/default/config.tmpl
-@@ -16,17 +16,10 @@
-     <tr><td class="infoTableHeader">SB Arguments: </td><td class="infoTableCell">$sickbeard.MY_ARGS</td></tr>
-     <tr><td class="infoTableHeader">SB Web Root: </td><td class="infoTableCell">$sickbeard.WEB_ROOT</td></tr>
-     <tr><td class="infoTableHeader">Python Version: </td><td class="infoTableCell">$sys.version[:120]</td></tr>
--    <tr style="border-top: 1px dotted #666666;"><td class="infoTableHeader">Homepage </td><td class="infoTableCell"><a href="http://www.sickbeard.com/">http://www.sickbeard.com/</a></td></tr>
--    <tr><td class="infoTableHeader">Forums </td><td class="infoTableCell"><a href="http://sickbeard.com/forums/">http://sickbeard.com/forums/</a></td></tr>
--    <tr><td class="infoTableHeader">Source </td><td class="infoTableCell"><a href="https://github.com/midgetspy/Sick-Beard/">https://github.com/midgetspy/Sick-Beard/</a></td></tr>
--    <tr><td class="infoTableHeader">Bug Tracker &amp;<br/> Windows Builds </td><td class="infoTableCell"><a href="http://code.google.com/p/sickbeard/">http://code.google.com/p/sickbeard/</a></td></tr>
--    <tr><td class="infoTableHeader">Internet Relay Chat </td><td class="infoTableCell"><a href="irc://irc.freenode.net/#sickbeard"><i>#sickbeard</i> on <i>irc.freenode.net</i></a></td></tr>
-+    <tr style="border-top: 1px dotted #666666;"><td class="infoTableHeader">Homepage </td><td class="infoTableCell"><a href="http://www.openelec.tv">http://www.openelec.tv</a></td></tr>
-+    <tr><td class="infoTableHeader">Forums </td><td class="infoTableCell"><a href="http://www.openelec.tv/forum/">http://www.openelec.tv/forum/</a></td></tr>
-+    <tr><td class="infoTableHeader">Internet Relay Chat </td><td class="infoTableCell"><a href="irc://irc.freenode.net/#openelec"><i>#openelec</i> on <i>irc.freenode.net</i></a></td></tr>
- </table>
- </div>
- 
--<table class="infoTable" cellspacing="1" border="0" cellpadding="0"><tr>
--    <td><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=JA8M7VDY89SQ4" onclick="window.open(this.href); return false;"><img src="$sbRoot/images/paypal/btn_donateCC_LG.gif" alt="[donate]" /></a></td>
--    <td>Sickbeard is free, but you can contribute by giving a <b><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=JA8M7VDY89SQ4" onclick="window.open(this.href); return false;">donation</a></b>.</td>
--</tr></table>
--
- #include $os.path.join($sickbeard.PROG_DIR, "data/interfaces/default/inc_bottom.tmpl")
-diff --git a/data/interfaces/default/inc_top.tmpl b/data/interfaces/default/inc_top.tmpl
-index b88e57c..11c6987 100644
---- a/data/interfaces/default/inc_top.tmpl
-+++ b/data/interfaces/default/inc_top.tmpl
-@@ -147,19 +147,6 @@ table.tablesorter thead tr .headerSortDown { background-image: url("$sbRoot/imag
- </head>
- 
- <body>
--#if $sickbeard.NEWEST_VERSION_STRING:
--<div id="upgrade-notification">
--    <div>
--        <span class="notify-text">$sickbeard.NEWEST_VERSION_STRING</span>
--    </div>
--</div>
--<div id="header-fix"></div>
--#end if
--<div id="header">
--    <a name="top"></a>
--    <span id="logo"><a href="$sbRoot/home/" title="Sick Beard homepage"><img alt="Sick Beard" src="$sbRoot/images/sickbeard_small.png" width="150" /></a></span>
--    <span id="versiontext">alpha $sickbeard.version.SICKBEARD_VERSION</span>
--</div>
- <ul id="MainMenu" class="sf-menu">
-             <li id="NAVsystem" class="first"><a href="#" class="navIcon"><img src="$sbRoot/images/menu/system18.png" alt="" width="18" height="18" /></a>
-                 <ul>
-@@ -196,7 +183,6 @@ table.tablesorter thead tr .headerSortDown { background-image: url("$sbRoot/imag
-                         <li><a href="$sbRoot/errorlogs/viewlog"><img src="$sbRoot/images/menu/viewlog16.png" alt="" width="16" height="16" />View Log</a></li>
-                 </ul>
-             </li>
--            <li id="donate"><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=JA8M7VDY89SQ4" onclick="window.open(this.href); return false;"><img src="$sbRoot/images/paypal/btn_donate_LG.gif" alt="[donate]" /></a></li>
- </ul>
- #if $varExists('submenu'):
- <div id="SubMenu">
--- 
-1.7.4.4
-
diff --git a/packages/addons/downloadmanager/Sick-Beard/patches/Sick-Beard-0f076f4-rm_version_port_browser_fields.patch b/packages/addons/downloadmanager/Sick-Beard/patches/Sick-Beard-0f076f4-rm_version_port_browser_fields.patch
deleted file mode 100644
index 2e2230f0c0..0000000000
--- a/packages/addons/downloadmanager/Sick-Beard/patches/Sick-Beard-0f076f4-rm_version_port_browser_fields.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 3385c7cf4ea5e5169848e63b3acc8d6f1e10a0ac Mon Sep 17 00:00:00 2001
-From: Anthony Nash <nash.ant@gmail.com>
-Date: Thu, 21 Apr 2011 00:06:34 +0100
-Subject: [PATCH 1/2] rm_version_port_browser_fields
-
----
- data/interfaces/default/config_general.tmpl |   31 ---------------------------
- data/interfaces/default/inc_top.tmpl        |    3 +-
- 2 files changed, 1 insertions(+), 33 deletions(-)
-
-diff --git a/data/interfaces/default/config_general.tmpl b/data/interfaces/default/config_general.tmpl
-index ee7bc51..f708ad0 100644
---- a/data/interfaces/default/config_general.tmpl
-+++ b/data/interfaces/default/config_general.tmpl
-@@ -32,26 +32,6 @@
- 
-                     <fieldset class="component-group-list">
-                         <div class="field-pair">
--                            <input type="checkbox" name="launch_browser" id="launch_browser" #if $sickbeard.LAUNCH_BROWSER then "checked=\"checked\"" else ""#/>
--                            <label class="clearfix" for="launch_browser">
--                                <span class="component-title">Launch Browser</span>
--                                <span class="component-desc">Should Sick Beard open its home page when started?</span>
--                            </label>
--                        </div>
--                        
--                        <div class="field-pair">
--                            <input type="checkbox" name="version_notify" id="version_notify" #if $sickbeard.VERSION_NOTIFY then "checked=\"checked\"" else ""#/>
--                            <label class="clearfix" for="version_notify">
--                                <span class="component-title">Check for Update</span>
--                                <span class="component-desc">Show notification about updates for Sick Beard if available.</span>
--                            </label>
--                            <label class="nocheck clearfix">
--                                <span class="component-title">&nbsp;</span>
--                                <span class="component-desc">Checking for updates runs on startup and every 12 hours.</span>
--                            </label>
--                        </div>
--
--                        <div class="field-pair">
-                             <label class="nocheck clearfix" for="log_dir">
-                                 <span class="component-title">Logging Directory</span>
-                                 <input type="text" name="log_dir" id="log_dir" value="$sickbeard.LOG_DIR" size="35" />
-@@ -90,17 +70,6 @@
-                         
-                         <div class="field-pair">
-                             <label class="nocheck clearfix">
--                                <span class="component-title">HTTP Port</span>
--                                <input type="text" name="web_port" value="$sickbeard.WEB_PORT" size="10" />
--                            </label>
--                            <label class="nocheck clearfix">
--                                <span class="component-title">&nbsp;</span>
--                                <span class="component-desc">Web port that Sick Beard should listen on (eg. 8081)</span>
--                            </label>
--                        </div>
--
--                        <div class="field-pair">
--                            <label class="nocheck clearfix">
-                                 <span class="component-title">HTTP Username</span>
-                                 <input type="text" name="web_username" value="$sickbeard.WEB_USERNAME" size="35" />
-                             </label>
-diff --git a/data/interfaces/default/inc_top.tmpl b/data/interfaces/default/inc_top.tmpl
-index 66e13af..b88e57c 100644
---- a/data/interfaces/default/inc_top.tmpl
-+++ b/data/interfaces/default/inc_top.tmpl
-@@ -88,7 +88,7 @@ table.tablesorter thead tr .headerSortDown { background-image: url("$sbRoot/imag
-                 autocompleteURL:   '$sbRoot/browser/complete'
-             }
-         };
--    //-->
-+    //-->
-     </script>
-     <script type="text/javascript" src="$sbRoot/js/jquery.scrolltopcontrol-1.1.js"></script>
-     <script type="text/javascript" src="$sbRoot/js/browser.js"></script>
-@@ -163,7 +163,6 @@ table.tablesorter thead tr .headerSortDown { background-image: url("$sbRoot/imag
- <ul id="MainMenu" class="sf-menu">
-             <li id="NAVsystem" class="first"><a href="#" class="navIcon"><img src="$sbRoot/images/menu/system18.png" alt="" width="18" height="18" /></a>
-                 <ul>
--                        <li><a href="$sbRoot/manage/manageSearches/forceVersionCheck"><img src="$sbRoot/images/menu/update16.png" alt="" width="16" height="16" />Force Version Check</a></li>
-                         <li><a href="$sbRoot/home/restart/?pid=$sbPID" class="confirm"><img src="$sbRoot/images/menu/restart16.png" alt="" width="16" height="16" />Restart</a></li>
-                         <li><a href="$sbRoot/home/shutdown/" class="confirm"><img src="$sbRoot/images/menu/shutdown16.png" alt="" width="16" height="16" />Shutdown</a></li>
-                 </ul>
--- 
-1.7.4.4
-
diff --git a/packages/addons/downloadmanager/Sick-Beard/patches/Sick-Beard-0f076f4-set_defaults.patch b/packages/addons/downloadmanager/Sick-Beard/patches/Sick-Beard-0f076f4-set_defaults.patch
deleted file mode 100644
index 705c9944b9..0000000000
--- a/packages/addons/downloadmanager/Sick-Beard/patches/Sick-Beard-0f076f4-set_defaults.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-From 6a43bf976a602c8ccf4de56d1da034e163c29ec7 Mon Sep 17 00:00:00 2001
-From: Anthony Nash <nash.ant@gmail.com>
-Date: Wed, 20 Apr 2011 23:07:28 +0100
-Subject: [PATCH 2/2] set defaults
-
----
- sickbeard/__init__.py |   30 +++++++++++++++---------------
- 1 files changed, 15 insertions(+), 15 deletions(-)
-
-diff --git a/sickbeard/__init__.py b/sickbeard/__init__.py
-index dc2dcf4..679576a 100644
---- a/sickbeard/__init__.py
-+++ b/sickbeard/__init__.py
-@@ -193,10 +193,10 @@ XBMC_HOST = ''
- XBMC_USERNAME = None
- XBMC_PASSWORD = None
- 
--USE_PLEX = False
-+USE_PLEX = False
- PLEX_NOTIFY_ONSNATCH = False
- PLEX_NOTIFY_ONDOWNLOAD = False
--PLEX_UPDATE_LIBRARY = False
-+PLEX_UPDATE_LIBRARY = False
- PLEX_SERVER_HOST = None
- PLEX_HOST = None
- PLEX_USERNAME = None
-@@ -341,7 +341,7 @@ def initialize(consoleLogging=True):
-                 SAB_USERNAME, SAB_PASSWORD, SAB_APIKEY, SAB_CATEGORY, SAB_HOST, \
-                 NZBGET_PASSWORD, NZBGET_CATEGORY, NZBGET_HOST, currentSearchScheduler, backlogSearchScheduler, \
-                 USE_XBMC, XBMC_NOTIFY_ONSNATCH, XBMC_NOTIFY_ONDOWNLOAD, XBMC_UPDATE_FULL, \
--                XBMC_UPDATE_LIBRARY, XBMC_HOST, XBMC_USERNAME, XBMC_PASSWORD, \
-+                XBMC_UPDATE_LIBRARY, XBMC_HOST, XBMC_USERNAME, XBMC_PASSWORD, \
-                 USE_PLEX, PLEX_NOTIFY_ONSNATCH, PLEX_NOTIFY_ONDOWNLOAD, PLEX_UPDATE_LIBRARY, \
-                 PLEX_SERVER_HOST, PLEX_HOST, PLEX_USERNAME, PLEX_PASSWORD, \
-                 showUpdateScheduler, __INITIALIZED__, LAUNCH_BROWSER, showList, loadingShowList, \
-@@ -375,7 +375,7 @@ def initialize(consoleLogging=True):
-         CheckSection('SABnzbd')
-         CheckSection('NZBget')
-         CheckSection('XBMC')
--        CheckSection('PLEX')
-+        CheckSection('PLEX')
-         CheckSection('Growl')
-         CheckSection('Prowl')
-         CheckSection('Twitter')
-@@ -386,12 +386,12 @@ def initialize(consoleLogging=True):
-             logger.log(u"!!! No log folder, logging to screen only!", logger.ERROR)
- 
-         try:
--            WEB_PORT = check_setting_int(CFG, 'General', 'web_port', 8081)
-+            WEB_PORT = check_setting_int(CFG, 'General', 'web_port', 8082)
-         except:
--            WEB_PORT = 8081
-+            WEB_PORT = 8082
- 
-         if WEB_PORT < 21 or WEB_PORT > 65535:
--            WEB_PORT = 8081
-+            WEB_PORT = 8082
- 
-         WEB_HOST = check_setting_str(CFG, 'General', 'web_host', '0.0.0.0')
-         WEB_IPV6 = bool(check_setting_int(CFG, 'General', 'web_ipv6', 0))
-@@ -399,7 +399,7 @@ def initialize(consoleLogging=True):
-         WEB_LOG = bool(check_setting_int(CFG, 'General', 'web_log', 0))
-         WEB_USERNAME = check_setting_str(CFG, 'General', 'web_username', '')
-         WEB_PASSWORD = check_setting_str(CFG, 'General', 'web_password', '')
--        LAUNCH_BROWSER = bool(check_setting_int(CFG, 'General', 'launch_browser', 1))
-+        LAUNCH_BROWSER = bool(check_setting_int(CFG, 'General', 'launch_browser', 0))
- 
-         ACTUAL_CACHE_DIR = check_setting_str(CFG, 'General', 'cache_dir', 'cache')
-         # fix bad configs due to buggy code
-@@ -439,7 +439,7 @@ def initialize(consoleLogging=True):
- 
-         QUALITY_DEFAULT = check_setting_int(CFG, 'General', 'quality_default', SD)
-         STATUS_DEFAULT = check_setting_int(CFG, 'General', 'status_default', SKIPPED)
--        VERSION_NOTIFY = check_setting_int(CFG, 'General', 'version_notify', 1)
-+        VERSION_NOTIFY = check_setting_int(CFG, 'General', 'version_notify', 0)
-         SEASON_FOLDERS_FORMAT = check_setting_str(CFG, 'General', 'season_folders_format', 'Season %02d')
-         SEASON_FOLDERS_DEFAULT = bool(check_setting_int(CFG, 'General', 'season_folders_default', 0))
- 
-@@ -525,10 +525,10 @@ def initialize(consoleLogging=True):
-         XBMC_USERNAME = check_setting_str(CFG, 'XBMC', 'xbmc_username', '')
-         XBMC_PASSWORD = check_setting_str(CFG, 'XBMC', 'xbmc_password', '')
- 
--        USE_PLEX = bool(check_setting_int(CFG, 'Plex', 'use_plex', 0))
-+        USE_PLEX = bool(check_setting_int(CFG, 'Plex', 'use_plex', 0))
-         PLEX_NOTIFY_ONSNATCH = bool(check_setting_int(CFG, 'Plex', 'plex_notify_onsnatch', 0))
-         PLEX_NOTIFY_ONDOWNLOAD = bool(check_setting_int(CFG, 'Plex', 'plex_notify_ondownload', 0))
--        PLEX_UPDATE_LIBRARY = bool(check_setting_int(CFG, 'Plex', 'plex_update_library', 0))
-+        PLEX_UPDATE_LIBRARY = bool(check_setting_int(CFG, 'Plex', 'plex_update_library', 0))
-         PLEX_SERVER_HOST = check_setting_str(CFG, 'Plex', 'plex_server_host', '')
-         PLEX_HOST = check_setting_str(CFG, 'Plex', 'plex_host', '')
-         PLEX_USERNAME = check_setting_str(CFG, 'Plex', 'plex_username', '')
-@@ -1010,12 +1010,12 @@ def save_config():
-     new_config['XBMC']['xbmc_host'] = XBMC_HOST
-     new_config['XBMC']['xbmc_username'] = XBMC_USERNAME
-     new_config['XBMC']['xbmc_password'] = XBMC_PASSWORD
--
--    new_config['Plex'] = {}
--    new_config['Plex']['use_plex'] = int(USE_PLEX)
-+
-+    new_config['Plex'] = {}
-+    new_config['Plex']['use_plex'] = int(USE_PLEX)
-     new_config['Plex']['plex_notify_onsnatch'] = int(PLEX_NOTIFY_ONSNATCH)
-     new_config['Plex']['plex_notify_ondownload'] = int(PLEX_NOTIFY_ONDOWNLOAD)
--    new_config['Plex']['plex_update_library'] = int(PLEX_UPDATE_LIBRARY)
-+    new_config['Plex']['plex_update_library'] = int(PLEX_UPDATE_LIBRARY)
-     new_config['Plex']['plex_server_host'] = PLEX_SERVER_HOST
-     new_config['Plex']['plex_host'] = PLEX_HOST
-     new_config['Plex']['plex_username'] = PLEX_USERNAME
--- 
-1.7.4.4
-
diff --git a/packages/addons/downloadmanager/Sick-Beard/source/resources/language/Dutch/strings.xml b/packages/addons/downloadmanager/Sick-Beard/source/resources/language/Dutch/strings.xml
deleted file mode 100644
index a8859c646b..0000000000
--- a/packages/addons/downloadmanager/Sick-Beard/source/resources/language/Dutch/strings.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<strings>
-
-	<!-- SickBeard -->
-	<string id="1000">SickBeard</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 (gescheiden met een ',')</string>
-
-</strings>
diff --git a/packages/addons/downloadmanager/Sick-Beard/source/resources/language/English/strings.xml b/packages/addons/downloadmanager/Sick-Beard/source/resources/language/English/strings.xml
deleted file mode 100644
index 48d23ac114..0000000000
--- a/packages/addons/downloadmanager/Sick-Beard/source/resources/language/English/strings.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<strings>
-
-	<!-- SickBeard -->
-	<string id="1000">SickBeard</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 (comma-delimited)</string>
-
-</strings>
diff --git a/packages/addons/downloadmanager/Sick-Beard/source/resources/language/French/strings.xml b/packages/addons/downloadmanager/Sick-Beard/source/resources/language/French/strings.xml
deleted file mode 100644
index 1868f4377a..0000000000
--- a/packages/addons/downloadmanager/Sick-Beard/source/resources/language/French/strings.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<strings>
-
-	<!-- SickBeard -->
-	<string id="1000">SickBeard</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 (séparées par des virgules)</string>
-
-</strings>
diff --git a/packages/addons/downloadmanager/Sick-Beard/source/resources/language/German/strings.xml b/packages/addons/downloadmanager/Sick-Beard/source/resources/language/German/strings.xml
deleted file mode 100644
index 934e645649..0000000000
--- a/packages/addons/downloadmanager/Sick-Beard/source/resources/language/German/strings.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<strings>
-
-	<!-- SickBeard -->
-	<string id="1000">SickBeard</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 (durch Komma getrennt)</string>
-
-</strings>
diff --git a/packages/addons/downloadmanager/Sick-Beard/source/resources/language/Norwegian/strings.xml b/packages/addons/downloadmanager/Sick-Beard/source/resources/language/Norwegian/strings.xml
deleted file mode 100644
index d93ce97ad9..0000000000
--- a/packages/addons/downloadmanager/Sick-Beard/source/resources/language/Norwegian/strings.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<strings>
-
-	<!-- SickBeard -->
-	<string id="1000">SickBeard</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 (komma-avgrenser)</string>
-
-</strings>
diff --git a/packages/addons/downloadmanager/Sick-Beard/source/resources/settings.xml b/packages/addons/downloadmanager/Sick-Beard/source/resources/settings.xml
deleted file mode 100644
index fa44dd850a..0000000000
--- a/packages/addons/downloadmanager/Sick-Beard/source/resources/settings.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<settings>
-
-   <!-- SickBeard -->
-    <category label="1000">
-		<setting label="1010" type="lsep"/>
-		<setting type="sep" />
-		<setting id="SICKBEARD_AUTH" type="bool" label="1021" default="false" />
-		<setting id="SICKBEARD_USER" type="text" label="1022" default="openelec" enable="eq(-1,true)"/>
-		<setting id="SICKBEARD_PWD" type="text" label="1023" default="openelec" enable="eq(-2,true)"/>
-
-		<setting label="2010" type="lsep"/>
-		<setting type="sep" />
-		<setting id="SICKBEARD_IP" type="text" label="2021" default="0.0.0.0"/>
-    </category>
-</settings>
diff --git a/packages/addons/downloadmanager/Sick-Beard/source/start.sh b/packages/addons/downloadmanager/Sick-Beard/source/start.sh
deleted file mode 100644
index 148b5c2270..0000000000
--- a/packages/addons/downloadmanager/Sick-Beard/source/start.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
-#      Copyright (C) 2011 Anthony Nash (nash.ant@gmail.com)
-#
-#  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
-################################################################################
-
-SICKBEARD_HOME="$HOME/.xbmc/userdata/addon_data/addon.downloadmanager.Sick-Beard"
-SICKBEARD_SETTINGS="$SICKBEARD_HOME/settings.xml"
-
-mkdir -p /var/run
-mkdir -p $SICKBEARD_HOME
-
-python ./Sick-Beard/SickBeard.py --daemon \
-                                       --pidfile=/var/run/sickbeard.pid \
-                                       --datadir $SICKBEARD_HOME
diff --git a/packages/addons/downloadmanager/Sick-Beard/addon b/packages/addons/downloadmanager/SickBeard/addon
similarity index 89%
rename from packages/addons/downloadmanager/Sick-Beard/addon
rename to packages/addons/downloadmanager/SickBeard/addon
index a6d6b3cab7..9b37c454b5 100755
--- a/packages/addons/downloadmanager/Sick-Beard/addon
+++ b/packages/addons/downloadmanager/SickBeard/addon
@@ -26,3 +26,5 @@
 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/pylib
+  cp -R $BUILD/Cheetah*/.install/usr/lib/python*/site-packages/* $ADDON_BUILD/$PKG_ADDON_ID/pylib
\ No newline at end of file
diff --git a/packages/addons/downloadmanager/SickBeard/changelog.txt b/packages/addons/downloadmanager/SickBeard/changelog.txt
new file mode 100644
index 0000000000..7b85927133
--- /dev/null
+++ b/packages/addons/downloadmanager/SickBeard/changelog.txt
@@ -0,0 +1,2 @@
+0.99.1
+- initial version SickBeard-48caf04
\ No newline at end of file
diff --git a/packages/addons/downloadmanager/Sick-Beard/icon/icon.png b/packages/addons/downloadmanager/SickBeard/icon/icon.png
similarity index 100%
rename from packages/addons/downloadmanager/Sick-Beard/icon/icon.png
rename to packages/addons/downloadmanager/SickBeard/icon/icon.png
diff --git a/packages/addons/downloadmanager/Sick-Beard/meta b/packages/addons/downloadmanager/SickBeard/meta
similarity index 85%
rename from packages/addons/downloadmanager/Sick-Beard/meta
rename to packages/addons/downloadmanager/SickBeard/meta
index 7617cf3779..4622f9bad3 100644
--- a/packages/addons/downloadmanager/Sick-Beard/meta
+++ b/packages/addons/downloadmanager/SickBeard/meta
@@ -19,21 +19,22 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-PKG_NAME="Sick-Beard"
-PKG_VERSION="0f076f4"
+PKG_NAME="SickBeard"
+PKG_VERSION="48caf04"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="https://github.com/midgetspy/Sick-Beard"
 PKG_URL="$OPENELEC_SRC/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
-PKG_DEPENDS="Python Cheetah SABnzbd"
+PKG_DEPENDS="Python Cheetah"
 PKG_BUILD_DEPENDS="toolchain Python"
 PKG_PRIORITY="optional"
 PKG_SECTION="downloadmanager"
-PKG_SHORTDESC="Sick-beard: automated TV show downloading."
-PKG_LONGDESC="Sick-beard: automated TV show downloading."
+PKG_SHORTDESC="SickBeard: automated TV show downloading."
+PKG_LONGDESC="SickBeard: automated TV show downloading."
 
 PKG_IS_ADDON="yes"
 PKG_ADDON_TYPE="xbmc.service"
+PKG_ADDON_REQUIRES="addon.downloadmanager.SABnzbd"
 
 PKG_AUTORECONF="no"
diff --git a/packages/addons/downloadmanager/SickBeard/patches/SickBeard-48caf04-001-remove_logo_update-header_and_donate_button-0.1.patch b/packages/addons/downloadmanager/SickBeard/patches/SickBeard-48caf04-001-remove_logo_update-header_and_donate_button-0.1.patch
new file mode 100644
index 0000000000..a8608033aa
--- /dev/null
+++ b/packages/addons/downloadmanager/SickBeard/patches/SickBeard-48caf04-001-remove_logo_update-header_and_donate_button-0.1.patch
@@ -0,0 +1,44 @@
+diff -Naur SickBeard-48caf04/data/interfaces/default/config.tmpl SickBeard-48caf04.patch/data/interfaces/default/config.tmpl
+--- SickBeard-48caf04/data/interfaces/default/config.tmpl	2011-04-22 19:15:10.000000000 +0200
++++ SickBeard-48caf04.patch/data/interfaces/default/config.tmpl	2011-04-23 03:57:14.515808144 +0200
+@@ -24,9 +24,4 @@
+ </table>
+ </div>
+ 
+-<table class="infoTable" cellspacing="1" border="0" cellpadding="0"><tr>
+-    <td><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=JA8M7VDY89SQ4" onclick="window.open(this.href); return false;"><img src="$sbRoot/images/paypal/btn_donateCC_LG.gif" alt="[donate]" /></a></td>
+-    <td>Sickbeard is free, but you can contribute by giving a <b><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=JA8M7VDY89SQ4" onclick="window.open(this.href); return false;">donation</a></b>.</td>
+-</tr></table>
+-
+ #include $os.path.join($sickbeard.PROG_DIR, "data/interfaces/default/inc_bottom.tmpl")
+diff -Naur SickBeard-48caf04/data/interfaces/default/inc_top.tmpl SickBeard-48caf04.patch/data/interfaces/default/inc_top.tmpl
+--- SickBeard-48caf04/data/interfaces/default/inc_top.tmpl	2011-04-22 19:15:10.000000000 +0200
++++ SickBeard-48caf04.patch/data/interfaces/default/inc_top.tmpl	2011-04-23 03:59:09.088665913 +0200
+@@ -147,19 +147,6 @@
+ </head>
+ 
+ <body>
+-#if $sickbeard.NEWEST_VERSION_STRING:
+-<div id="upgrade-notification">
+-    <div>
+-        <span class="notify-text">$sickbeard.NEWEST_VERSION_STRING</span>
+-    </div>
+-</div>
+-<div id="header-fix"></div>
+-#end if
+-<div id="header">
+-    <a name="top"></a>
+-    <span id="logo"><a href="$sbRoot/home/" title="Sick Beard homepage"><img alt="Sick Beard" src="$sbRoot/images/sickbeard_small.png" width="150" /></a></span>
+-    <span id="versiontext">alpha $sickbeard.version.SICKBEARD_VERSION</span>
+-</div>
+ <ul id="MainMenu" class="sf-menu">
+             <li id="NAVsystem" class="first"><a href="#" class="navIcon"><img src="$sbRoot/images/menu/system18.png" alt="" width="18" height="18" /></a>
+                 <ul>
+@@ -197,7 +184,6 @@
+                         <li><a href="$sbRoot/errorlogs/viewlog"><img src="$sbRoot/images/menu/viewlog16.png" alt="" width="16" height="16" />View Log</a></li>
+                 </ul>
+             </li>
+-            <li id="donate"><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=JA8M7VDY89SQ4" onclick="window.open(this.href); return false;"><img src="$sbRoot/images/paypal/btn_donate_LG.gif" alt="[donate]" /></a></li>
+ </ul>
+ #if $varExists('submenu'):
+ <div id="SubMenu">
diff --git a/packages/addons/downloadmanager/SickBeard/patches/SickBeard-48caf04-002-remove_default_settings-0.3.patch b/packages/addons/downloadmanager/SickBeard/patches/SickBeard-48caf04-002-remove_default_settings-0.3.patch
new file mode 100644
index 0000000000..6ce1b303f7
--- /dev/null
+++ b/packages/addons/downloadmanager/SickBeard/patches/SickBeard-48caf04-002-remove_default_settings-0.3.patch
@@ -0,0 +1,74 @@
+diff -Naur SickBeard-48caf04/data/interfaces/default/config_notifications.tmpl SickBeard-48caf04.patch/data/interfaces/default/config_notifications.tmpl
+--- SickBeard-48caf04/data/interfaces/default/config_notifications.tmpl	2011-04-23 03:55:23.000000000 +0200
++++ SickBeard-48caf04.patch/data/interfaces/default/config_notifications.tmpl	2011-04-23 18:01:29.330455515 +0200
+@@ -484,48 +484,6 @@
+ 
+                 </div>
+ 
+-
+-                <div id="core-component-group7" class="component-group clearfix">
+-                    <div class="component-group-desc">
+-                        <h3><a href="http://library.gnome.org/devel/libnotify/" onclick="window.open(this.href, '_blank'); return false;"><img src="$sbRoot/images/notifiers/libnotify.gif" alt="Libnotify" title="Libnotify" width="16" height="16" /> Libnotify</a></h3>
+-                        <p>The standard desktop notification API for Linux/*nix systems.  This notifier will only function if the pynotify module is installed (Ubuntu/Debian package <a href="apt:python-notify">python-notify</a>).</p>
+-                    </div>
+-
+-                    <fieldset class="component-group-list">
+-                        <div class="field-pair">
+-                            <input type="checkbox" class="enabler" name="use_libnotify" id="use_libnotify" #if $sickbeard.USE_LIBNOTIFY then "checked=\"checked\"" else ""# /> 
+-                            <label class="clearfix" for="use_libnotify">
+-                                <span class="component-title">Enable</span>
+-                                <span class="component-desc">Should Sick Beard send Libnotify notifications?</span>
+-                            </label>
+-                        </div>
+-
+-                        <div id="content_use_libnotify">
+-                        <div class="field-pair">
+-                            <input type="checkbox" name="libnotify_notify_onsnatch" id="libnotify_notify_onsnatch" #if $sickbeard.LIBNOTIFY_NOTIFY_ONSNATCH then "checked=\"checked\"" else ""# /> 
+-                            <label class="clearfix" for="libnotify_notify_onsnatch">
+-                                <span class="component-title">Notify on Snatch</span>
+-                                <span class="component-desc">Send notification when we start a download?</span>
+-                            </label>
+-                        </div>
+-
+-                        <div class="field-pair">
+-                            <input type="checkbox" name="libnotify_notify_ondownload" id="libnotify_notify_ondownload" #if $sickbeard.LIBNOTIFY_NOTIFY_ONDOWNLOAD then "checked=\"checked\"" else ""# />
+-                            <label class="clearfix" for="libnotify_notify_ondownload">
+-                                <span class="component-title">Notify on Download</span>
+-                                <span class="component-desc">Send notification when we finish a download?</span>
+-                            </label>
+-                        </div>
+-
+-                        <div class="testNotification" id="testLibnotify-result">Click below to test.</div>
+-                        <input type="button" value="Test Libnotify" id="testLibnotify" />
+-                        <input type="submit" class="config_submitter" value="Save Changes" />
+-
+-                        </div><!-- /content_use_libnotify //-->
+-
+-                    </fieldset>
+-                </div><!-- /component-group //-->
+-
+                 <div id="core-component-group8" class="component-group clearfix">
+ 
+                     <div class="component-group-desc">
+diff -Naur SickBeard-48caf04/data/interfaces/default/inc_top.tmpl SickBeard-48caf04.patch/data/interfaces/default/inc_top.tmpl
+--- SickBeard-48caf04/data/interfaces/default/inc_top.tmpl	2011-04-23 03:59:09.000000000 +0200
++++ SickBeard-48caf04.patch/data/interfaces/default/inc_top.tmpl	2011-04-23 14:24:01.035048035 +0200
+@@ -172,7 +172,6 @@
+             </li>
+             <li id="NAVconfig"><a href="$sbRoot/config">Config</a>
+                 <ul>
+-                        <li><a href="$sbRoot/config/general/"><img src="$sbRoot/images/menu/config16.png" alt="" width="16" height="16" />General</a></li>
+                         <li><a href="$sbRoot/config/search/"><img src="$sbRoot/images/menu/config16.png" alt="" width="16" height="16" />Search Settings</a></li>
+                         <li><a href="$sbRoot/config/providers/"><img src="$sbRoot/images/menu/config16.png" alt="" width="16" height="16" />Search Providers</a></li>
+                         <li><a href="$sbRoot/config/postProcessing/"><img src="$sbRoot/images/menu/config16.png" alt="" width="16" height="16" />Post Processing</a></li>
+diff -Naur SickBeard-48caf04/sickbeard/webserve.py SickBeard-48caf04.patch/sickbeard/webserve.py
+--- SickBeard-48caf04/sickbeard/webserve.py	2011-04-23 03:55:23.000000000 +0200
++++ SickBeard-48caf04.patch/sickbeard/webserve.py	2011-04-23 17:55:09.270813146 +0200
+@@ -583,7 +583,6 @@
+ 
+ 
+ ConfigMenu = [
+-    { 'title': 'General',           'path': 'config/general/'          },
+     { 'title': 'Search Settings',   'path': 'config/search/'           },
+     { 'title': 'Search Providers',  'path': 'config/providers/'        },
+     { 'title': 'Post Processing',   'path': 'config/postProcessing/'   },
diff --git a/packages/addons/downloadmanager/SickBeard/source/bin/ini_tool b/packages/addons/downloadmanager/SickBeard/source/bin/ini_tool
new file mode 100755
index 0000000000..97f7b4c433
--- /dev/null
+++ b/packages/addons/downloadmanager/SickBeard/source/bin/ini_tool
@@ -0,0 +1,117 @@
+#!/usr/bin/env python
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2011 Travis Glenn Hansen (travisghansen@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
+################################################################################
+
+from configobj import ConfigObj
+import sys
+import os
+import string
+
+python_major = sys.version_info[0]
+python_minor = sys.version_info[1]
+
+prog="ini_tool"
+description="""Read/Write config files.
+
+Examples:
+	%(prog)s --file config.ini --action read --option [section:]username
+	%(prog)s --file config.ini --action write --option [section:]username --value foo""" % {'prog':prog}
+
+def option_required_error(option):
+	parser.print_usage()
+	print prog + ": error: " + option + " is required"
+	exit(2)
+
+if python_major > 2 or (python_major == 2 and python_minor >= 7):
+	import argparse
+	
+	parser = argparse.ArgumentParser(
+		prog=prog,
+		description=description,
+		formatter_class=argparse.RawDescriptionHelpFormatter,
+		)
+
+	parser.add_argument('--file', help='file to read/write to/from', required=True)
+	parser.add_argument('--action', help='read|write', required=True)
+	parser.add_argument('--option', help='the option key', required=True)
+	parser.add_argument('--value', help='value to store in the given option (only for write action)')
+
+	options = parser.parse_args()
+
+else:
+	import optparse
+	
+	parser = optparse.OptionParser(
+		prog=prog,
+		description=description,
+		)
+
+	parser.add_option('--file', help='file to read/write to/from')
+	parser.add_option('--action', help='read|write')
+	parser.add_option('--option', help='the option key')
+	parser.add_option('--value', help='value to store in the given option (only for write action)')
+
+	(options, args) = parser.parse_args()
+
+	if not options.file:
+		option_required_error("--file")
+	if not options.action:
+		option_required_error("--action")
+	if not options.option:
+		option_required_error("--option")
+
+
+if options.action != "read" and options.action != "write":
+	print "'" + options.action + "' is not a valid action"
+	parser.print_help()
+	exit(2)
+
+if options.action == "read" and not os.path.isfile(options.file):
+	print "'" + options.file + "' is not a file"
+	exit(2)
+
+config = ConfigObj(options.file)
+keys = string.split(options.option, ":")
+key_len = len(keys)
+current_section = config
+
+if options.action == 'read':
+    i = 1
+    for key in keys:
+        if i == key_len:
+            print current_section[key]
+            exit(0)
+        else:
+            current_section = current_section[key]
+            i += 1
+elif options.action == 'write':
+    i = 1
+    for key in keys:
+        if i == key_len:
+            current_section[key] = options.value
+        elif key not in current_section:
+            current_section[key] = {}
+        current_section = current_section[key]
+        i += 1
+    
+    config.write()
+else:
+	exit(1)
\ No newline at end of file
diff --git a/packages/addons/downloadmanager/Sick-Beard/source/default.py b/packages/addons/downloadmanager/SickBeard/source/default.py
similarity index 100%
rename from packages/addons/downloadmanager/Sick-Beard/source/default.py
rename to packages/addons/downloadmanager/SickBeard/source/default.py
diff --git a/packages/addons/downloadmanager/SickBeard/source/start.sh b/packages/addons/downloadmanager/SickBeard/source/start.sh
new file mode 100755
index 0000000000..134e273b6f
--- /dev/null
+++ b/packages/addons/downloadmanager/SickBeard/source/start.sh
@@ -0,0 +1,115 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#      Copyright (C) 2011 Anthony Nash (nash.ant@gmail.com)
+#
+#  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"
+
+SICKBEARD_HOME="$HOME/.xbmc/userdata/addon_data/addon.downloadmanager.SickBeard"
+SABNZBD_SETTINGS="$HOME/.xbmc/userdata/addon_data/addon.downloadmanager.SABnzbd/sabnzbd.ini"
+XBMC_SETTINGS="$HOME/.xbmc/userdata/guisettings.xml"
+
+write_ini() {
+python bin/ini_tool --action=write \
+                    --file=$SICKBEARD_HOME/config.ini \
+                    --option="$1:$2" \
+                    --value="$3"
+}
+
+read_sabconfig() {
+python bin/ini_tool --action=read \
+                    --file=$SABNZBD_SETTINGS \
+                    --option="$1:$2"
+}
+
+read_xbmcconfig() {
+grep "<$1>" $XBMC_SETTINGS | sed -e "s,[[:space:]]*<$1>,," -e "s,</$1>,,"
+}
+
+mkdir -p $SICKBEARD_HOME
+chmod +x ./bin/*
+
+if [ ! -f "$SICKBEARD_HOME/settings.xml" ]; then
+  cp settings-default.xml $SICKBEARD_HOME/settings.xml
+fi
+
+if [ ! -f "$SICKBEARD_HOME/config.ini" ]; then
+  SICKBEARD_FIRSTRUN="yes"
+fi
+
+# default values
+  SICKBEARD_LOGDIR="log"
+  SICKBEARD_CACHEDIR="cache"
+  SICKBEARD_PORT="8082"
+  SICKBEARD_LAUNCHBROWSER="0"
+  SICKBEARD_VERSIONCHECK="0"
+  SICKBEARD_USEIPV6="0"
+  SICKBEARD_WEBLOG="0"
+
+  SICKBEARD_USEXBMC="1"
+  SICKBEARD_METADATAXBMC="1|1|1|1|1|1"
+
+# read xbmc settings
+  XBMC_HOST="127.0.0.1"
+  XBMC_PORT=`read_xbmcconfig webserverport`
+  XBMC_USER=`read_xbmcconfig webserverusername`
+  XBMC_PWD=`read_xbmcconfig webserverpassword`
+
+# read sabnzbd settings
+  SABNZBD_HOST="127.0.0.1"
+  SABNZBD_PORT="8081"
+  SABNZBD_APIKEY=`read_sabconfig misc api_key`
+  SABNZBD_WEBUSERNAME=`read_sabconfig misc username`
+  SABNZBD_WEBPASSWORD=`read_sabconfig misc password`
+
+if [ -z "$SICKBEARD_HOST" ]; then
+  SICKBEARD_HOST="0.0.0.0"
+fi
+
+write_ini General launch_browser $SICKBEARD_LAUNCHBROWSER
+write_ini General version_notify $SICKBEARD_VERSIONCHECK
+write_ini General log_dir $SICKBEARD_LOGDIR
+write_ini General cache_dir $SICKBEARD_CACHEDIR
+write_ini General web_port $SICKBEARD_PORT
+write_ini General web_host $SICKBEARD_HOST
+write_ini General web_ipv6 $SICKBEARD_USEIPV6
+write_ini General web_log $SICKBEARD_WEBLOG
+write_ini General web_username $SABNZBD_WEBUSERNAME
+write_ini General web_password $SABNZBD_WEBPASSWORD
+
+write_ini SABnzbd sab_username $SABNZBD_WEBUSERNAME
+write_ini SABnzbd sab_password $SABNZBD_WEBPASSWORD
+write_ini SABnzbd sab_apikey $SABNZBD_APIKEY
+write_ini SABnzbd sab_host "http://$SABNZBD_HOST:$SABNZBD_PORT/"
+
+write_ini XBMC use_xbmc $SICKBEARD_USEXBMC
+write_ini XBMC xbmc_host "$XBMC_HOST:$XBMC_PORT"
+write_ini XBMC xbmc_username $XBMC_USER
+write_ini XBMC xbmc_password $XBMC_PWD
+
+if [ "$SICKBEARD_FIRSTRUN" = "yes" ]; then
+write_ini General metadata_xbmc $SICKBEARD_METADATAXBMC
+fi
+
+python ./SickBeard/SickBeard.py --daemon \
+                                --pidfile=/var/run/sickbeard.pid \
+                                --datadir $SICKBEARD_HOME > /dev/null 2>&1