diff --git a/packages/addons/service/web/maraschino/addon b/packages/addons/service/web/maraschino/addon
new file mode 100755
index 0000000000..1c2f35f10d
--- /dev/null
+++ b/packages/addons/service/web/maraschino/addon
@@ -0,0 +1,31 @@
+#!/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/
+  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
new file mode 100644
index 0000000000..80e79ec0cf
--- /dev/null
+++ b/packages/addons/service/web/maraschino/changelog.txt
@@ -0,0 +1,2 @@
+0.99.1
+- initial version maraschino-923de4c
diff --git a/packages/addons/service/web/maraschino/icon/icon.png b/packages/addons/service/web/maraschino/icon/icon.png
new file mode 100644
index 0000000000..5112b330ee
Binary files /dev/null and b/packages/addons/service/web/maraschino/icon/icon.png differ
diff --git a/packages/addons/service/web/maraschino/meta b/packages/addons/service/web/maraschino/meta
new file mode 100644
index 0000000000..1f955948f2
--- /dev/null
+++ b/packages/addons/service/web/maraschino/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="maraschino"
+PKG_VERSION="923de4c"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="OSS"
+PKG_SITE="http://www.maraschinoproject.com/"
+PKG_URL="https://dl.dropbox.com/u/9676785/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS="Python"
+PKG_BUILD_DEPENDS="toolchain Python CherryPy"
+PKG_PRIORITY="optional"
+PKG_SECTION="service/web"
+PKG_SHORTDESC="Maraschino: Web interface to act as a nice overview/front page for my XBMC HTPC"
+PKG_LONGDESC="Maraschino is an XBMC web interface with customisable applications module providing quick access to your web interfaces (e.g. SABnzb+, SickBeard, or whatever else you want to link to), recently added episodes module, media library browser, currently playing bar and disk space module."
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.service"
+
+PKG_AUTORECONF="no"
diff --git a/packages/addons/service/web/maraschino/source/bin/maraschino.service b/packages/addons/service/web/maraschino/source/bin/maraschino.service
new file mode 100755
index 0000000000..d4e4dc9ee7
--- /dev/null
+++ b/packages/addons/service/web/maraschino/source/bin/maraschino.service
@@ -0,0 +1,32 @@
+#!/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
+################################################################################
+
+# Addon settings
+  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
diff --git a/packages/addons/service/web/maraschino/source/default.py b/packages/addons/service/web/maraschino/source/default.py
new file mode 100644
index 0000000000..254cbf4f0f
--- /dev/null
+++ b/packages/addons/service/web/maraschino/source/default.py
@@ -0,0 +1,23 @@
+################################################################################
+#      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 xbmc, time, os, subprocess
+
+os.system("maraschino.service")