diff --git a/packages/addons/service/webgrabplus/changelog.txt b/packages/addons/service/webgrabplus/changelog.txt
new file mode 100644
index 0000000000..9455e1f3c8
--- /dev/null
+++ b/packages/addons/service/webgrabplus/changelog.txt
@@ -0,0 +1,2 @@
+8.0.100
+- Initial addon
diff --git a/packages/addons/service/webgrabplus/icon/icon.png b/packages/addons/service/webgrabplus/icon/icon.png
new file mode 100644
index 0000000000..1d627fb191
Binary files /dev/null and b/packages/addons/service/webgrabplus/icon/icon.png differ
diff --git a/packages/addons/service/webgrabplus/package.mk b/packages/addons/service/webgrabplus/package.mk
new file mode 100644
index 0000000000..6ee52d8763
--- /dev/null
+++ b/packages/addons/service/webgrabplus/package.mk
@@ -0,0 +1,33 @@
+PKG_NAME="webgrabplus"
+PKG_VERSION="56.27pre-20160721"
+PKG_REV="100"
+PKG_ARCH="any"
+PKG_LICENSE="prop."
+PKG_SITE="http://www.webgrabplus.com/"
+PKG_URL="https://github.com/awiouy/webgrabplus/archive/$PKG_VERSION.tar.gz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="service"
+PKG_SHORTDESC="WebGrab+Plus: a multi-site incremental xmltv epg grabber"
+PKG_LONGDESC="WebGrab+Plus ($PKG_VERSION) collects tv-program guide data from selected tvguide sites for your favourite channels."
+PKG_AUTORECONF="no"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_NAME="WebGrab+Plus"
+PKG_ADDON_TYPE="xbmc.service"
+PKG_ADDON_REPOVERSION="8.0"
+PKG_ADDON_REQUIRES="tools.mono:0.0.0"
+PKG_MAINTAINER="Anton Voyl (awiouy)"
+
+make_target() {
+  : # nop
+}
+
+makeinstall_target() {
+  : # nop
+}
+
+addon() {
+  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID
+  cp -PR $PKG_BUILD/* $ADDON_BUILD/$PKG_ADDON_ID
+}
diff --git a/packages/addons/service/webgrabplus/source/bin/webgrabplus.start b/packages/addons/service/webgrabplus/source/bin/webgrabplus.start
new file mode 100644
index 0000000000..842b354956
--- /dev/null
+++ b/packages/addons/service/webgrabplus/source/bin/webgrabplus.start
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+. /etc/profile
+oe_setup_addon service.webgrabplus
+
+mkdir -p "$ADDON_HOME"
+cd "$ADDON_HOME"
+
+for p in chans2correct.xml mdb rex siteini.pack WebGrab++.config.xml
+do
+  if [ ! -e "$p" ]
+  then
+    cp -r "$ADDON_DIR/config/$p" .
+  fi
+done
+
+sid="$(basename $(find $ADDON_DIR/config/siteini.pack -name SiteIni.Pack_*.txt))"
+sih="$(basename $(find siteini.pack -name SiteIni.Pack_*.txt))"
+if [ "$sid" \> "$sih" ]
+then
+  rm -rf siteini.pack
+  cp -r "$ADDON_DIR/config/siteini.pack" .
+fi
+
+mono $ADDON_DIR/WebGrab+Plus/WebGrab+Plus.exe
+
+cp guide_wgp.xml guide.xml
+mono $ADDON_DIR/WebGrab+Plus/xmltv_time_correct.exe guide_wgp.xml guide.xml < /dev/zero
+
+mono $ADDON_DIR/WebGrab+Plus/WG2MP.exe guide.xml mediaportal.xml
diff --git a/packages/addons/service/webgrabplus/source/default.py b/packages/addons/service/webgrabplus/source/default.py
new file mode 100644
index 0000000000..2666e0f27c
--- /dev/null
+++ b/packages/addons/service/webgrabplus/source/default.py
@@ -0,0 +1,17 @@
+import subprocess
+import xbmc
+import xbmcaddon
+
+
+class Monitor(xbmc.Monitor):
+
+   def __init__(self, *args, **kwargs):
+      xbmc.Monitor.__init__(self)
+      self.id = xbmcaddon.Addon().getAddonInfo('id')
+
+   def onSettingsChanged(self):
+      subprocess.call(['systemctl', 'restart', self.id])
+
+
+if __name__ == "__main__":
+   Monitor().waitForAbort()
diff --git a/packages/addons/service/webgrabplus/source/system.d/service.webgrabplus.service b/packages/addons/service/webgrabplus/source/system.d/service.webgrabplus.service
new file mode 100644
index 0000000000..1cb5fc3440
--- /dev/null
+++ b/packages/addons/service/webgrabplus/source/system.d/service.webgrabplus.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=WebGrab+Plus
+Documentation=http://www.webgrabplus.com/
+After=network.target
+Requires=network.target
+
+[Service]
+ExecStart=/bin/sh /storage/.kodi/addons/service.webgrabplus/bin/webgrabplus.start
+Restart=always
+RestartSec=21600
+
+[Install]
+WantedBy=kodi.target