diff --git a/packages/addons/service/tigervnc/changelog.txt b/packages/addons/service/tigervnc/changelog.txt
new file mode 100644
index 0000000000..ffbebe8438
--- /dev/null
+++ b/packages/addons/service/tigervnc/changelog.txt
@@ -0,0 +1,2 @@
+100
+- Initial addon
diff --git a/packages/addons/service/tigervnc/package.mk b/packages/addons/service/tigervnc/package.mk
new file mode 100644
index 0000000000..7157b7fb3b
--- /dev/null
+++ b/packages/addons/service/tigervnc/package.mk
@@ -0,0 +1,46 @@
+################################################################################
+# This file is part of LibreELEC - http://www.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 .
+################################################################################
+PKG_NAME="tigervnc"
+PKG_VERSION="1.7.0"
+PKG_ARCH="x86_64"
+PKG_LICENSE="GPLv2"
+PKG_SITE="http://www.tigervnc.org"
+PKG_URL="https://github.com/TigerVNC/tigervnc/archive/v$PKG_VERSION.tar.gz"
+PKG_DEPENDS_TARGET="toolchain cmake:host libX11 libXext libXtst zlib libjpeg-turbo"
+PKG_SECTION="service"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_NAME="TigerVNC"
+PKG_ADDON_TYPE="xbmc.service"
+PKG_REV="100"
+PKG_SHORTDESC="$PKG_ADDON_NAME server"
+PKG_LONGDESC="$PKG_ADDON_NAME ($PKG_VERSION) is a high-performance, platform-neutral implementation of Virtual Network Computing, a client/server application that allows users to launch and interact with graphical applications on remote machines"
+
+PKG_CMAKE_OPTS_TARGET="-DBUILD_VIEWER=off"
+
+makeinstall_target() {
+ : # nothing to do
+}
+
+addon() {
+ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
+ cp $PKG_BUILD/.$TARGET_NAME/unix/vncconfig/vncconfig \
+ $PKG_BUILD/.$TARGET_NAME/unix/vncpasswd/vncpasswd \
+ $PKG_BUILD/.$TARGET_NAME/unix/x0vncserver/x0vncserver \
+ $ADDON_BUILD/$PKG_ADDON_ID/bin/
+}
diff --git a/packages/addons/service/tigervnc/source/config/passwd b/packages/addons/service/tigervnc/source/config/passwd
new file mode 100644
index 0000000000..a72cfb172e
--- /dev/null
+++ b/packages/addons/service/tigervnc/source/config/passwd
@@ -0,0 +1 @@
+ôu@›(³8Ž
\ No newline at end of file
diff --git a/packages/addons/service/tigervnc/source/default.py b/packages/addons/service/tigervnc/source/default.py
new file mode 100644
index 0000000000..3999a0eb31
--- /dev/null
+++ b/packages/addons/service/tigervnc/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 .
+################################################################################
+
+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/tigervnc/source/resources/language/English/strings.po b/packages/addons/service/tigervnc/source/resources/language/English/strings.po
new file mode 100644
index 0000000000..627d33fac1
--- /dev/null
+++ b/packages/addons/service/tigervnc/source/resources/language/English/strings.po
@@ -0,0 +1,13 @@
+# Kodi Media Center language file
+# Addon Name: tigervnc
+# Addon id: service.tigervnc
+msgid ""
+msgstr ""
+
+msgctxt "#30000"
+msgid "Configuration"
+msgstr ""
+
+msgctxt "#30001"
+msgid "port"
+msgstr ""
diff --git a/packages/addons/service/tigervnc/source/resources/settings.xml b/packages/addons/service/tigervnc/source/resources/settings.xml
new file mode 100644
index 0000000000..da0bb528d3
--- /dev/null
+++ b/packages/addons/service/tigervnc/source/resources/settings.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/packages/addons/service/tigervnc/source/settings-default.xml b/packages/addons/service/tigervnc/source/settings-default.xml
new file mode 100644
index 0000000000..09894dacdf
--- /dev/null
+++ b/packages/addons/service/tigervnc/source/settings-default.xml
@@ -0,0 +1,3 @@
+
+
+
diff --git a/packages/addons/service/tigervnc/source/system.d/service.tigervnc.service b/packages/addons/service/tigervnc/source/system.d/service.tigervnc.service
new file mode 100644
index 0000000000..4929e1d0ca
--- /dev/null
+++ b/packages/addons/service/tigervnc/source/system.d/service.tigervnc.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=TigerVNC
+After=graphical.target
+
+[Service]
+Environment=DISPLAY=:0.0
+ExecStart=/storage/.kodi/addons/service.tigervnc/bin/x0vncserver -PasswordFile=/storage/.kodi/addons/service.tigervnc/config/passwd
+TimeoutStopSec=1
+Restart=always
+RestartSec=2
+StartLimitInterval=0
+
+[Install]
+WantedBy=kodi.target