diff --git a/packages/addons/service/tigervnc/icon/icon.png b/packages/addons/service/tigervnc/icon/icon.png
new file mode 100644
index 0000000000..c831ea23dd
Binary files /dev/null and b/packages/addons/service/tigervnc/icon/icon.png differ
diff --git a/packages/addons/service/tigervnc/package.mk b/packages/addons/service/tigervnc/package.mk
index 7157b7fb3b..1e9fc78abf 100644
--- a/packages/addons/service/tigervnc/package.mk
+++ b/packages/addons/service/tigervnc/package.mk
@@ -15,8 +15,10 @@
 #  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="tigervnc"
 PKG_VERSION="1.7.0"
+PKG_REV="100"
 PKG_ARCH="x86_64"
 PKG_LICENSE="GPLv2"
 PKG_SITE="http://www.tigervnc.org"
@@ -27,7 +29,6 @@ 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"
 
diff --git a/packages/addons/service/tigervnc/source/bin/tigervnc.start b/packages/addons/service/tigervnc/source/bin/tigervnc.start
new file mode 100644
index 0000000000..624699d1e8
--- /dev/null
+++ b/packages/addons/service/tigervnc/source/bin/tigervnc.start
@@ -0,0 +1,28 @@
+#!/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.tigervnc
+
+if [ ! -f "$ADDON_HOME/passwd" ]
+then
+  cp "$ADDON_DIR/config/passwd" "$ADDON_HOME/passwd"
+fi
+
+x0vncserver -PasswordFile="$ADDON_HOME/passwd" -rfbport="$vnc_port"
diff --git a/packages/addons/service/tigervnc/source/system.d/service.tigervnc.service b/packages/addons/service/tigervnc/source/system.d/service.tigervnc.service
index 4929e1d0ca..acb149f9c7 100644
--- a/packages/addons/service/tigervnc/source/system.d/service.tigervnc.service
+++ b/packages/addons/service/tigervnc/source/system.d/service.tigervnc.service
@@ -4,7 +4,7 @@ After=graphical.target
 
 [Service]
 Environment=DISPLAY=:0.0
-ExecStart=/storage/.kodi/addons/service.tigervnc/bin/x0vncserver -PasswordFile=/storage/.kodi/addons/service.tigervnc/config/passwd
+ExecStart=/bin/sh /storage/.kodi/addons/service.tigervnc/bin/tigervnc.start
 TimeoutStopSec=1
 Restart=always
 RestartSec=2