diff --git a/packages/addons/service/web/maraschino/addon b/packages/addons/service/web/maraschino/addon
index cae99c9b35..a1c4b96d4f 100755
--- a/packages/addons/service/web/maraschino/addon
+++ b/packages/addons/service/web/maraschino/addon
@@ -24,8 +24,3 @@
 
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/
   cp -PR $PKG_BUILD/* $ADDON_BUILD/$PKG_ADDON_ID/
-  cp -PR $ADDON_BUILD/$PKG_ADDON_ID/settings_example.py $ADDON_BUILD/$PKG_ADDON_ID/settings.py
-  sed 's/\/path\/to\/maraschino.db/\/storage\/.xbmc\/userdata\/addon_data\/service.web.maraschino\/maraschino.db/' -i $ADDON_BUILD/$PKG_ADDON_ID/settings.py
-
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/pylib
-  cp -R $BUILD/CherryPy*/.install/usr/lib/python*/site-packages/* $ADDON_BUILD/$PKG_ADDON_ID/pylib
\ No newline at end of file
diff --git a/packages/addons/service/web/maraschino/changelog.txt b/packages/addons/service/web/maraschino/changelog.txt
index 188d0c72af..32c823e8ce 100644
--- a/packages/addons/service/web/maraschino/changelog.txt
+++ b/packages/addons/service/web/maraschino/changelog.txt
@@ -1,3 +1,7 @@
+2.1.2
+- update to maraschino-40e2ce0
+- add possibilty to start / stop addon from addon manager with enable / disable
+
 2.1.1
 - update to addon version 2.1
 - update to maraschino-707e82c
diff --git a/packages/addons/service/web/maraschino/meta b/packages/addons/service/web/maraschino/meta
index e7e8e1d6f6..c79433cfcc 100644
--- a/packages/addons/service/web/maraschino/meta
+++ b/packages/addons/service/web/maraschino/meta
@@ -19,8 +19,8 @@
 ################################################################################
 
 PKG_NAME="maraschino"
-PKG_VERSION="707e82c"
-PKG_REV="1"
+PKG_VERSION="40e2ce0"
+PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.maraschinoproject.com/"
diff --git a/packages/addons/service/web/maraschino/source/bin/maraschino.service b/packages/addons/service/web/maraschino/source/bin/maraschino.start
similarity index 93%
rename from packages/addons/service/web/maraschino/source/bin/maraschino.service
rename to packages/addons/service/web/maraschino/source/bin/maraschino.start
index 30054c8099..729ed0222d 100755
--- a/packages/addons/service/web/maraschino/source/bin/maraschino.service
+++ b/packages/addons/service/web/maraschino/source/bin/maraschino.start
@@ -24,9 +24,8 @@
   ADDON_DIR="$HOME/.xbmc/addons/service.web.maraschino"
   ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.web.maraschino"
 
-  export PYTHONPATH="$PYTHONPATH:$ADDON_DIR/pylib"
 
 ################################################################################
 # start maraschino
 ################################################################################
-  python $ADDON_DIR/maraschino-cherrypy.py -q
+  python $ADDON_DIR/Maraschino.py --datadir=$ADDON_HOME
diff --git a/packages/addons/service/web/maraschino/source/bin/maraschino.stop b/packages/addons/service/web/maraschino/source/bin/maraschino.stop
new file mode 100755
index 0000000000..f290a87971
--- /dev/null
+++ b/packages/addons/service/web/maraschino/source/bin/maraschino.stop
@@ -0,0 +1,2 @@
+#!/bin/sh
+kill -9 `ps | grep -E 'python.*/Maraschino.py' | awk '{print $1}'` 2>/dev/null
diff --git a/packages/addons/service/web/maraschino/source/default.py b/packages/addons/service/web/maraschino/source/default.py
index e8df616e86..e0c362a109 100644
--- a/packages/addons/service/web/maraschino/source/default.py
+++ b/packages/addons/service/web/maraschino/source/default.py
@@ -18,6 +18,22 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-import xbmc, time, os, subprocess
+import xbmc, time, os, subprocess, xbmcaddon
 
-subprocess.Popen("maraschino.service", shell=True, close_fds=True)
+__scriptname__ = "maraschino service"
+__author__ = "OpenELEC"
+__url__ = "http://www.openelec.tv"
+__settings__   = xbmcaddon.Addon(id='service.web.maraschino')
+__cwd__        = __settings__.getAddonInfo('path')
+__start__      = xbmc.translatePath( os.path.join( __cwd__, 'bin', "maraschino.start") )
+__stop__       = xbmc.translatePath( os.path.join( __cwd__, 'bin', "maraschino.stop") )
+
+#make binary files executable in addon bin folder
+subprocess.Popen("chmod -R +x " + __cwd__ + "/bin/*" , shell=True, close_fds=True)
+
+subprocess.Popen(__start__, shell=True, close_fds=True)
+
+while (not xbmc.abortRequested):
+  time.sleep(0.250)
+
+subprocess.Popen(__stop__, shell=True, close_fds=True)
diff --git a/tools/mkpkg/mkpkg_tvheadend b/tools/mkpkg/mkpkg_tvheadend
index bc02a9e598..b8e14f154c 100755
--- a/tools/mkpkg/mkpkg_tvheadend
+++ b/tools/mkpkg/mkpkg_tvheadend
@@ -21,7 +21,7 @@
 
 echo "getting sources..."
   if [ ! -d hts-tvheadend.git ]; then
-    git clone https://github.com/andoma/tvheadend.git hts-tvheadend.git
+    git clone https://github.com/tvheadend/tvheadend.git hts-tvheadend.git
   fi
 
   cd hts-tvheadend.git