diff --git a/packages/addons/service/syncthing/changelog.txt b/packages/addons/service/syncthing/changelog.txt
new file mode 100644
index 0000000000..b47649f5c3
--- /dev/null
+++ b/packages/addons/service/syncthing/changelog.txt
@@ -0,0 +1,3 @@
+8.0.100
+- Initial addon
+
diff --git a/packages/addons/service/syncthing/icon/icon.png b/packages/addons/service/syncthing/icon/icon.png
new file mode 100644
index 0000000000..c473dd9e4a
Binary files /dev/null and b/packages/addons/service/syncthing/icon/icon.png differ
diff --git a/packages/addons/service/syncthing/package.mk b/packages/addons/service/syncthing/package.mk
new file mode 100644
index 0000000000..3e1af754c9
--- /dev/null
+++ b/packages/addons/service/syncthing/package.mk
@@ -0,0 +1,86 @@
+################################################################################
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2016 Team LibreELEC
+#
+#  LibreELEC 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 of the License, or
+#  (at your option) any later version.
+#
+#  LibreELEC 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 LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="syncthing"
+PKG_VERSION="0.12.22"
+PKG_REV="100"
+PKG_ARCH="any"
+PKG_LICENSE="MPLv2"
+PKG_SITE="https://syncthing.net/"
+PKG_URL="https://github.com/syncthing/syncthing/archive/v${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain go:host"
+PKG_PRIORITY="optional"
+PKG_SECTION="service/system"
+
+PKG_SHORTDESC="Open Source Continuous File Synchronization"
+PKG_LONGDESC="Syncthing replaces proprietary sync and cloud services with something open, trustworthy and decentralized. Your data is your data alone and you deserve to choose where it is stored, if it is shared with some third party and how it's transmitted over the Internet."
+PKG_MAINTAINER="Anton Voyl (awiouy at gmail dot com)"
+PKG_ADDON_REPOVERSION="8.0"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.service"
+PKG_ADDON_PROVIDES=""
+PKG_AUTORECONF="no"
+
+configure_target() {
+
+  case $TARGET_ARCH in
+    x86_64)
+      export GOARCH=amd64
+      ;;
+    arm)
+      export GOARCH=arm
+      case $TARGET_CPU in
+        arm1176jzf-s)
+          export GOARM=6
+          ;;
+        cortex-a7|cortex-a9)
+          export GOARM=7
+          ;;
+      esac
+      ;;
+  esac
+
+  export GOOS=linux
+  export CGO_ENABLED=1
+  export CGO_NO_EMULATION=1
+  export CGO_CFLAGS=$CFLAGS
+  export LDFLAGS="-w -linkmode external -extldflags -Wl,--unresolved-symbols=ignore-in-shared-libs -extld $TARGET_CC -X main.Version=v$PKG_VERSION"
+  export GOLANG=$ROOT/$TOOLCHAIN/lib/golang/bin/go
+  export GOPATH=$ROOT/$PKG_BUILD:$ROOT/$PKG_BUILD/Godeps/_workspace
+  export GOROOT=$ROOT/$TOOLCHAIN/lib/golang
+  export PATH=$PATH:$GOROOT/bin
+
+  mkdir -p $ROOT/$PKG_BUILD $ROOT/$PKG_BUILD/src/github.com/syncthing
+  ln -fs $ROOT/$PKG_BUILD $ROOT/$PKG_BUILD/src/github.com/syncthing/syncthing
+
+}
+
+make_target() {
+  mkdir -p bin
+  $GOLANG build -v -o bin/syncthing -a -tags noupgrade -ldflags "$LDFLAGS" ./cmd/syncthing
+}
+
+makeinstall_target() {
+  :
+}
+
+addon() {
+  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp -P $ROOT/$PKG_BUILD/bin/syncthing $ADDON_BUILD/$PKG_ADDON_ID/bin
+}
diff --git a/packages/addons/service/syncthing/source/bin/syncthing-service b/packages/addons/service/syncthing/source/bin/syncthing-service
new file mode 100644
index 0000000000..45812d867e
--- /dev/null
+++ b/packages/addons/service/syncthing/source/bin/syncthing-service
@@ -0,0 +1,31 @@
+#!/bin/sh
+################################################################################
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2016 Team LibreELEC
+#
+#  LibreELEC 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 of the License, or
+#  (at your option) any later version.
+#
+#  LibreELEC 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 LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+. /etc/profile
+oe_setup_addon service.system.syncthing
+
+chmod +x $ADDON_DIR/bin/*
+
+STNODEFAULTFOLDER="y" syncthing -home=$ADDON_HOME           \
+                                -gui-address="$gui_address" \
+                                -logflags=0                 \
+                                -no-browser                 \
+                                -no-restart                 \
+                                &
+
diff --git a/packages/addons/service/syncthing/source/default.py b/packages/addons/service/syncthing/source/default.py
new file mode 100644
index 0000000000..3999a0eb31
--- /dev/null
+++ b/packages/addons/service/syncthing/source/default.py
@@ -0,0 +1,35 @@
+################################################################################
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2016 Team LibreELEC
+#
+#  LibreELEC 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 of the License, or
+#  (at your option) any later version.
+#
+#  LibreELEC 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 LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+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/syncthing/source/resources/language/English/strings.po b/packages/addons/service/syncthing/source/resources/language/English/strings.po
new file mode 100644
index 0000000000..2c7084c08f
--- /dev/null
+++ b/packages/addons/service/syncthing/source/resources/language/English/strings.po
@@ -0,0 +1,14 @@
+# Kodi Media Center language file
+# Addon Name: syncthing
+# Addon id: service.system.syncthing
+# Addon Provider: awiouy at gmail dot com
+msgid ""
+msgstr ""
+
+msgctxt "#30000"
+msgid "GUI Address"
+msgstr ""
+
+msgctxt "#30001"
+msgid "GUI Address"
+msgstr ""
diff --git a/packages/addons/service/syncthing/source/resources/settings.xml b/packages/addons/service/syncthing/source/resources/settings.xml
new file mode 100644
index 0000000000..442a8507d8
--- /dev/null
+++ b/packages/addons/service/syncthing/source/resources/settings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<settings>
+   <category label="30000">
+      <setting id="gui_address" label="30001" type="text" default="0.0.0.0:8384" />
+   </category>
+</settings>
+
diff --git a/packages/addons/service/syncthing/source/settings-default.xml b/packages/addons/service/syncthing/source/settings-default.xml
new file mode 100644
index 0000000000..c36bbd0391
--- /dev/null
+++ b/packages/addons/service/syncthing/source/settings-default.xml
@@ -0,0 +1,3 @@
+<settings>
+   <setting id="gui_address" value="0.0.0.0:8384" />
+</settings>
diff --git a/packages/addons/service/syncthing/source/system.d/service.system.syncthing.service b/packages/addons/service/syncthing/source/system.d/service.system.syncthing.service
new file mode 100644
index 0000000000..8e8839fef3
--- /dev/null
+++ b/packages/addons/service/syncthing/source/system.d/service.system.syncthing.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=Syncthing - Open Source Continuous File Synchronization
+Documentation=http://docs.syncthing.net/
+After=network.target
+Requires=network.target
+
+[Service]
+Type=forking
+ExecStart=/bin/sh /storage/.kodi/addons/service.system.syncthing/bin/syncthing-service
+Restart=on-failure
+SuccessExitStatus=3 4
+RestartForceExitStatus=3 4
+
+[Install]
+WantedBy=kodi.target
+