diff --git a/packages/addons/service/web/maraschino/source/bin/maraschino.start b/packages/addons/service/web/maraschino/source/bin/maraschino.start
new file mode 100755
index 0000000000..d88ccccca9
--- /dev/null
+++ b/packages/addons/service/web/maraschino/source/bin/maraschino.start
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+# Addon settings
+  ADDON_DIR="$HOME/.xbmc/addons/service.web.maraschino"
+  ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.web.maraschino"
+
+
+################################################################################
+# start maraschino
+################################################################################
+  python $ADDON_DIR/Maraschino.py --log=$ADDON_HOME/maraschino.log --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)