diff --git a/packages/addons/service/snapserver/changelog.txt b/packages/addons/service/snapserver/changelog.txt
new file mode 100644
index 0000000000..ffbebe8438
--- /dev/null
+++ b/packages/addons/service/snapserver/changelog.txt
@@ -0,0 +1,2 @@
+100
+- Initial addon
diff --git a/packages/addons/service/snapserver/icon/icon.png b/packages/addons/service/snapserver/icon/icon.png
new file mode 100644
index 0000000000..6bf0f85a1a
Binary files /dev/null and b/packages/addons/service/snapserver/icon/icon.png differ
diff --git a/packages/addons/service/snapserver/package.mk b/packages/addons/service/snapserver/package.mk
new file mode 100644
index 0000000000..74d6fc6bb4
--- /dev/null
+++ b/packages/addons/service/snapserver/package.mk
@@ -0,0 +1,48 @@
+################################################################################
+# This file is part of LibreELEC - https://libreelec.tv
+# Copyright (C) 2018-present 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 .
+################################################################################
+
+PKG_NAME="snapserver"
+PKG_VERSION="0.13.0"
+PKG_REV="100"
+PKG_ARCH="any"
+PKG_LICENSE="GPLv3"
+PKG_DEPENDS_TARGET="toolchain shairport-sync snapcast"
+PKG_SECTION="service"
+PKG_SHORTDESC="Snapserver: Synchronous multi-room audio server"
+PKG_LONGDESC="Snapclient ($PKG_VERSION) is a Snapcast server. Snapcast is a multi-room client-server audio system, where all clients are time synchronized with the server to play perfectly synced audioplays."
+PKG_AUTORECONF="no"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_NAME="Snapserver"
+PKG_ADDON_TYPE="xbmc.service"
+PKG_MAINTAINER="Anton Voyl (awiouy)"
+
+make_target() {
+ :
+}
+
+makeinstall_target() {
+ :
+}
+
+addon() {
+ mkdir -p "$ADDON_BUILD/$PKG_ADDON_ID/bin"
+ cp "$(get_build_dir shairport-sync)/.$TARGET_NAME/shairport-sync" \
+ "$(get_build_dir snapcast)/server/snapserver" \
+ "$ADDON_BUILD/$PKG_ADDON_ID/bin"
+}
diff --git a/packages/addons/service/snapserver/source/bin/snapserver.start b/packages/addons/service/snapserver/source/bin/snapserver.start
new file mode 100644
index 0000000000..3cc71a6609
--- /dev/null
+++ b/packages/addons/service/snapserver/source/bin/snapserver.start
@@ -0,0 +1,39 @@
+#!/bin/sh
+################################################################################
+# This file is part of LibreELEC - https://libreelec.tv
+# Copyright (C) 2018-present 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 .
+################################################################################
+
+. /etc/profile
+oe_setup_addon service.snapserver
+
+case "$ss_ps" in
+ Default)
+ ss_us="--stream pipe:///tmp/snapfifo?name=Default"
+ ;;
+ Airplay)
+ ss_us="--stream airplay:///shairport-sync?name=Airplay"
+ ;;
+ Spotify)
+ ss_us="--stream spotify:///librespot?name=Spotify"
+ ;;
+esac
+
+snapserver \
+ --controlPort "$ss_cp" \
+ --daemon "$ss_ni" \
+ --port "$ss_sp" \
+ $ss_us
diff --git a/packages/addons/service/snapserver/source/default.py b/packages/addons/service/snapserver/source/default.py
new file mode 100644
index 0000000000..a4ba4d9ce1
--- /dev/null
+++ b/packages/addons/service/snapserver/source/default.py
@@ -0,0 +1,39 @@
+################################################################################
+# This file is part of LibreELEC - https://libreelec.tv
+# Copyright (C) 2018-present 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 .
+################################################################################
+
+import subprocess
+import xbmc
+import xbmcaddon
+
+
+def systemctl(command):
+ subprocess.call(
+ ['systemctl', command, xbmcaddon.Addon().getAddonInfo('id')])
+
+
+class Monitor(xbmc.Monitor):
+
+ def __init__(self, *args, **kwargs):
+ xbmc.Monitor.__init__(self)
+
+ def onSettingsChanged(self):
+ systemctl('restart')
+
+
+if __name__ == '__main__':
+ Monitor().waitForAbort()
diff --git a/packages/addons/service/snapserver/source/resources/language/English/strings.po b/packages/addons/service/snapserver/source/resources/language/English/strings.po
new file mode 100644
index 0000000000..2ee26e3825
--- /dev/null
+++ b/packages/addons/service/snapserver/source/resources/language/English/strings.po
@@ -0,0 +1,30 @@
+# Kodi Media Center language file
+# Addon Name: snapserver
+# Addon id: service.snapclient
+# Addon Provider: Team LibreELEC
+msgid ""
+msgstr ""
+
+msgctxt "#30000"
+msgid "Snapserver"
+msgstr ""
+
+msgctxt "#30001"
+msgid "Server port"
+msgstr ""
+
+msgctxt "#30002"
+msgid "Control port"
+msgstr ""
+
+msgctxt "#30003"
+msgid "Priority"
+msgstr ""
+
+msgctxt "#30004"
+msgid "Preset"
+msgstr ""
+
+msgctxt "#30005"
+msgid "Stream"
+msgstr ""
diff --git a/packages/addons/service/snapserver/source/resources/settings.xml b/packages/addons/service/snapserver/source/resources/settings.xml
new file mode 100644
index 0000000000..2a1ea8583a
--- /dev/null
+++ b/packages/addons/service/snapserver/source/resources/settings.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/addons/service/snapserver/source/settings-default.xml b/packages/addons/service/snapserver/source/settings-default.xml
new file mode 100644
index 0000000000..c414a13335
--- /dev/null
+++ b/packages/addons/service/snapserver/source/settings-default.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/packages/addons/service/snapserver/source/system.d/service.snapserver.service b/packages/addons/service/snapserver/source/system.d/service.snapserver.service
new file mode 100644
index 0000000000..09232a23f5
--- /dev/null
+++ b/packages/addons/service/snapserver/source/system.d/service.snapserver.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Snapserver
+After=kodi.service network-online.target sound.target
+Requires=kodi.service network-online.target sound.target
+
+[Service]
+Type=forking
+ExecStart=/bin/sh /storage/.kodi/addons/service.snapserver/bin/snapserver.start
+
+[Install]
+WantedBy=kodi.target