diff --git a/packages/downloadmanager/transmission/install b/packages/addons/downloadmanager/transmission/addon
similarity index 76%
rename from packages/downloadmanager/transmission/install
rename to packages/addons/downloadmanager/transmission/addon
index 417efb15af..909fab06e8 100755
--- a/packages/downloadmanager/transmission/install
+++ b/packages/addons/downloadmanager/transmission/addon
@@ -22,10 +22,10 @@
 
 . config/options $1
 
-mkdir -p $INSTALL/usr/sbin
-  cp $PKG_BUILD/daemon/transmission-daemon $INSTALL/usr/sbin
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp $PKG_BUILD/daemon/transmission-daemon $ADDON_BUILD/$PKG_ADDON_ID/bin
 
-mkdir -p $INSTALL/usr/share/transmission/web
-  cp -R $PKG_BUILD/web/* $INSTALL/usr/share/transmission/web
-  find $INSTALL/usr/share/transmission/web -name "Makefile*" -exec rm -rf {} ";"
-  rm -rf $INSTALL/usr/share/transmission/web/LICENSE
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/web
+  cp -R $PKG_BUILD/web/* $ADDON_BUILD/$PKG_ADDON_ID/web
+  find $ADDON_BUILD/$PKG_ADDON_ID/web -name "Makefile*" -exec rm -rf {} ";"
+  rm -rf $ADDON_BUILD/$PKG_ADDON_ID/web/LICENSE
diff --git a/packages/downloadmanager/transmission/build b/packages/addons/downloadmanager/transmission/build
similarity index 100%
rename from packages/downloadmanager/transmission/build
rename to packages/addons/downloadmanager/transmission/build
diff --git a/packages/addons/downloadmanager/transmission/changelog.txt b/packages/addons/downloadmanager/transmission/changelog.txt
new file mode 100644
index 0000000000..7ccba46688
--- /dev/null
+++ b/packages/addons/downloadmanager/transmission/changelog.txt
@@ -0,0 +1,2 @@
+0.99.1
+- initial version transmission-2.20
\ No newline at end of file
diff --git a/packages/addons/downloadmanager/transmission/icon/icon.png b/packages/addons/downloadmanager/transmission/icon/icon.png
new file mode 100644
index 0000000000..f7b3af06dc
Binary files /dev/null and b/packages/addons/downloadmanager/transmission/icon/icon.png differ
diff --git a/packages/downloadmanager/transmission/meta b/packages/addons/downloadmanager/transmission/meta
similarity index 94%
rename from packages/downloadmanager/transmission/meta
rename to packages/addons/downloadmanager/transmission/meta
index 900893addd..49883994df 100644
--- a/packages/downloadmanager/transmission/meta
+++ b/packages/addons/downloadmanager/transmission/meta
@@ -20,7 +20,7 @@
 
 PKG_NAME="transmission"
 PKG_VERSION="2.20"
-PKG_REV="1"
+PKG_REV="4"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.transmissionbt.com/"
@@ -28,9 +28,11 @@ PKG_URL="http://download.transmissionbt.com/files/$PKG_NAME-$PKG_VERSION.tar.bz2
 PKG_DEPENDS="zlib libiconv openssl curl libevent connman"
 PKG_BUILD_DEPENDS="toolchain libiconv zlib openssl curl libevent"
 PKG_PRIORITY="optional"
-PKG_SECTION="system"
+PKG_SECTION="downloadmanager"
 PKG_SHORTDESC="transmission: a fast, easy and free BitTorrent client"
 PKG_LONGDESC="transmission is a fast, easy and free BitTorrent client"
-PKG_IS_ADDON="no"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.service"
 
 PKG_AUTORECONF="yes"
diff --git a/packages/addons/downloadmanager/transmission/source/default.py b/packages/addons/downloadmanager/transmission/source/default.py
new file mode 100644
index 0000000000..5f07881ccc
--- /dev/null
+++ b/packages/addons/downloadmanager/transmission/source/default.py
@@ -0,0 +1,26 @@
+################################################################################
+#      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
+################################################################################
+
+import sys
+import xbmcaddon
+import os
+
+if ( __name__ == "__main__" ):
+    os.system("sh start.sh")
diff --git a/packages/addons/downloadmanager/transmission/source/resources/language/Dutch/strings.xml b/packages/addons/downloadmanager/transmission/source/resources/language/Dutch/strings.xml
new file mode 100644
index 0000000000..fa0aa99153
--- /dev/null
+++ b/packages/addons/downloadmanager/transmission/source/resources/language/Dutch/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+
+	<!-- Transmission -->
+	<string id="1000">Transmission</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/transmission/source/resources/language/English/strings.xml b/packages/addons/downloadmanager/transmission/source/resources/language/English/strings.xml
new file mode 100644
index 0000000000..3b79dbcaee
--- /dev/null
+++ b/packages/addons/downloadmanager/transmission/source/resources/language/English/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+
+	<!-- Transmission -->
+	<string id="1000">Transmission</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/transmission/source/resources/language/French/strings.xml b/packages/addons/downloadmanager/transmission/source/resources/language/French/strings.xml
new file mode 100644
index 0000000000..2abe85fd7a
--- /dev/null
+++ b/packages/addons/downloadmanager/transmission/source/resources/language/French/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+
+	<!-- Transmission -->
+	<string id="1000">Transmission</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/transmission/source/resources/language/German/strings.xml b/packages/addons/downloadmanager/transmission/source/resources/language/German/strings.xml
new file mode 100644
index 0000000000..542f5757d1
--- /dev/null
+++ b/packages/addons/downloadmanager/transmission/source/resources/language/German/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+
+	<!-- Transmission -->
+	<string id="1000">Transmission</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/transmission/source/resources/language/Norwegian/strings.xml b/packages/addons/downloadmanager/transmission/source/resources/language/Norwegian/strings.xml
new file mode 100644
index 0000000000..24538d14c1
--- /dev/null
+++ b/packages/addons/downloadmanager/transmission/source/resources/language/Norwegian/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+
+	<!-- Transmission -->
+	<string id="1000">Transmission</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/transmission/source/resources/settings.xml b/packages/addons/downloadmanager/transmission/source/resources/settings.xml
new file mode 100644
index 0000000000..bcb2471ef0
--- /dev/null
+++ b/packages/addons/downloadmanager/transmission/source/resources/settings.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<settings>
+
+   <!-- Transmission -->
+    <category label="1000">
+		<setting label="1010" type="lsep"/>
+		<setting type="sep" />
+		<setting id="TRANSMISSION_AUTH" type="bool" label="1021" default="false" />
+		<setting id="TRANSMISSION_USER" type="text" label="1022" default="openelec" enable="eq(-1,true)"/>
+		<setting id="TRANSMISSION_PWD" type="text" label="1023" default="openelec" enable="eq(-2,true)"/>
+
+		<setting label="2010" type="lsep"/>
+		<setting type="sep" />
+		<setting id="TRANSMISSION_IP" type="text" label="2021" default="*.*.*.*"/>
+    </category>
+</settings>
diff --git a/packages/addons/downloadmanager/transmission/source/start.sh b/packages/addons/downloadmanager/transmission/source/start.sh
new file mode 100755
index 0000000000..152e2d1f77
--- /dev/null
+++ b/packages/addons/downloadmanager/transmission/source/start.sh
@@ -0,0 +1,53 @@
+#!/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 TRANSMISSION_WEB_HOME="./web"
+
+mkdir -p /storage/downloads
+mkdir -p /storage/downloads/incoming
+mkdir -p /storage/downloads/watch
+
+#if [ -f /tmp/transmisson.conf ]; then
+#  . /tmp/transmission.conf
+
+  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/transmission-daemon
+  ./bin/transmission-daemon $TRANSMISSION_ARG
+#fi
diff --git a/packages/downloadmanager/transmission/init.d/58_transmission b/packages/downloadmanager/transmission/init.d/58_transmission
deleted file mode 100644
index 741e9051b7..0000000000
--- a/packages/downloadmanager/transmission/init.d/58_transmission
+++ /dev/null
@@ -1,56 +0,0 @@
-################################################################################
-#      Copyright (C) 2009-2010 OpenELEC.tv
-#      http://www.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
-################################################################################
-
-# start transmission bt daemon
-#
-# runlevels: openelec, textmode
-
-(
-  if [ -f /var/config/settings.conf ]; then
-    . /var/config/settings.conf
-
-    if [ "$TRANSMISSION_START" = "true" ]; then
-
-      wait_for_network
-
-      progress "Starting Transmission BT daemon"
-
-      TRANSMISSION_ARG="-w /storage/downloads \
-                        --incomplete-dir /storage/downloads/incoming \
-                        --watch-dir /storage/downloads/watch \
-                        -e /var/log/transmission.log \
-                        -g /storage/.cache/transmission \
-                        -a $TRANSMISSION_IP"
-
-      if [ "$TRANSMISSION_AUTH" = "true" ]; then
-        TRANSMISSION_ARG="$TRANSMISSION_ARG -t \
-                                            -u $TRANSMISSION_USER \
-                                            -v $TRANSMISSION_PWD"
-      else
-        TRANSMISSION_ARG="$TRANSMISSION_ARG -T"
-      fi
-
-      mkdir -p /storage/downloads
-      mkdir -p /storage/downloads/incoming
-      mkdir -p /storage/downloads/watch
-      transmission-daemon $TRANSMISSION_ARG
-    fi
-  fi
-)&
diff --git a/projects/ATV/options b/projects/ATV/options
index e52403ddb2..d9f43c0706 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 Transmission BitTorrent daemon (yes / no)
-  TRANSMISSION="no"
-
 # build and install SABnzbd Newsgroup downloader daemon (yes / no)
   SABNZBD="no"
 
diff --git a/projects/Generic/options b/projects/Generic/options
index dd56dc0e02..1d545db33c 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 Transmission BitTorrent daemon (yes / no)
-  TRANSMISSION="yes"
-
 # build and install SABnzbd Newsgroup downloader daemon (yes / no)
   SABNZBD="yes"
 
diff --git a/projects/ION/options b/projects/ION/options
index f1ea80a585..8aa49adb2e 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 Transmission BitTorrent daemon (yes / no)
-  TRANSMISSION="yes"
-
 # build and install SABnzbd Newsgroup downloader daemon (yes / no)
   SABNZBD="yes"
 
diff --git a/projects/Intel/options b/projects/Intel/options
index 0210911a24..b87f8f8ebe 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 Transmission BitTorrent daemon (yes / no)
-  TRANSMISSION="yes"
-
 # build and install SABnzbd Newsgroup downloader daemon (yes / no)
   SABNZBD="yes"
 
diff --git a/scripts/image b/scripts/image
index 4ae8ab7165..3e5cf4e7b8 100755
--- a/scripts/image
+++ b/scripts/image
@@ -95,9 +95,6 @@ mkdir -p $INSTALL
 # Network support
   [ "$NETWORK" = "yes" ] && $SCRIPTS/install network
 
-# Transmission BitTorrent support
-  [ "$TRANSMISSION" = "yes" ] && $SCRIPTS/install transmission
-
 # SABnzbd support
   [ "$SABNZBD" = "yes" ] && $SCRIPTS/install SABnzbd
   [ "$SABNZBD" = "yes" ] && $SCRIPTS/install Sick-Beard