diff --git a/community/tightvnc/PKGBUILD b/community/tightvnc/PKGBUILD
index 8be7aff9c..6fd557efe 100644
--- a/community/tightvnc/PKGBUILD
+++ b/community/tightvnc/PKGBUILD
@@ -1,37 +1,49 @@
-# $Id: PKGBUILD 67960 2012-03-16 12:47:31Z arodseth $
+# $Id: PKGBUILD 79388 2012-11-04 00:54:52Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Paul Mattal <paul@archlinux.org>
+# Contributor: Andrew Hills <hills.as@gmail.com>
+# Contributor: John <graysky@archlinux.us>
 
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
 #  - patch to enable ARM building, contributed by vahokif
 
-plugrel=1
-
 pkgname=tightvnc
 pkgver=1.3.10
-pkgrel=8
-pkgdesc="VNC Unix server && viewer"
-arch=('i686' 'x86_64')
+pkgrel=9
+pkgdesc='VNC server and viewer'
+arch=('x86_64' 'i686')
 license=('GPL')
-url="http://www.tightvnc.com"
+url='http://www.tightvnc.com'
 depends=('libjpeg' 'zlib' 'libxaw' 'libxp' 'xorg-xauth' 'perl')
-makedepends=('imake' 'setconf')
+makedepends=('imake' 'setconf' 'gendesk')
 options=('!makeflags')
 source=("http://downloads.sf.net/sourceforge/vnc-tight/$pkgname-${pkgver}_unixsrc.tar.bz2"
         'http://people.csail.mit.edu/jaffer/Color/rgb.txt'
+        'vncserver.service'
+        'tightvnc.png::http://virtual.itca.edu.sv/dokeos/sinapsis/cd/redes/vnc/tightvnc/documentos/TightVNC%20Frequently%20Asked%20Questions_archivos/tightvnc-logo.jpg'
         'tightvnc-1.3.10-arm.patch')
 sha256sums=('f48c70fea08d03744ae18df6b1499976362f16934eda3275cead87baad585c0d'
             'af6c056a95ae725f98534db22b9a4916d17f2356fdca84a4a038211a82fa8a73'
+            'ccadf1fc708fad601e6113464d6c533a629f6dc9116f6071347cd0b465c1f48b'
+            '2592196a56444143c2f0c3738dce98f89ea0d46b125a3ea54ac1dbb50914b945'
             '8ee519594642ab9309f9f7a91bcd6938f2117a23452d19edf78259b46381bd40')
+_exec=('vncviewer')
+_name=('TightVNC Viewer')
 
 build() {
-  cd $srcdir/vnc_unixsrc
-  patch -Np1 -i "${srcdir}"/tightvnc-1.3.10-arm.patch
+  cd $srcdir
+  gendesk -n
+  setconf $pkgname.desktop Categories 'Application;Network;'
 
+  cd vnc_unixsrc
+  patch -Np1 -i "${srcdir}"/tightvnc-1.3.10-arm.patch
   setconf vncserver '$vncClasses' \"/usr/share/tightvnc\"\;
-  setconf vncserver '$fontPath' \"/usr/share/fonts/misc/,/usr/share/fonts/75dpi/,/usr/share/fonts/100dpi/,/usr/share/fonts/Type1/\"\;
+  setconf vncserver '$fontPath' \
+    \"/usr/share/fonts/misc/,/usr/share/fonts/75dpi/,/usr/share/fonts/100dpi/,/usr/share/fonts/Type1/\"\;
+  sed -i 's:/lib/cpp:/usr/bin/cpp:' Xvnc/config/cf/linux.cf
   xmkmf
   make World
+
   cd Xvnc
   ./configure
   setconf programs/Xserver/dix/Makefile DEFAULTRGBDATABASE '/usr/share/tightvnc/rgb'
@@ -41,14 +53,21 @@ build() {
 }
 
 package() {
-  cd "$srcdir/vnc_unixsrc"
+  cd $srcdir/vnc_unixsrc
+  mkdir -p $pkgdir/usr/bin $pkgdir/usr/share/man/man1
+  ./vncinstall $pkgdir/usr/bin $pkgdir/usr/share/man
+  mkdir -p $pkgdir/usr/share/$pkgname
 
-  mkdir -p "$pkgdir/usr/bin" "$pkgdir/usr/share/man/man1"
-  ./vncinstall "$pkgdir/usr/bin" "$pkgdir/usr/share/man"
-  mkdir -p "$pkgdir/usr/share/$pkgname"
-  install -Dm644 "$srcdir/vnc_unixsrc/classes/"* \
-    "$pkgdir/usr/share/$pkgname"
-  install -Dm644 "$srcdir/rgb.txt" "$pkgdir/usr/share/$pkgname/rgb.txt"
+  cd $srcdir
+  install -Dm644 vnc_unixsrc/classes/* \
+    $pkgdir/usr/share/$pkgname
+  install -Dm644 rgb.txt $pkgdir/usr/share/$pkgname/rgb.txt
+  install -Dm644 $pkgname.desktop \
+    $pkgdir/usr/share/applications/$pkgname.desktop
+  install -Dm644 $pkgname.png \
+    $pkgdir/usr/share/pixmaps/$pkgname.png
+  install -Dm644 vncserver.service \
+    $pkgdir/usr/lib/systemd/system/vncserver.service
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/tightvnc/vncserver.service b/community/tightvnc/vncserver.service
new file mode 100644
index 000000000..b64e729a6
--- /dev/null
+++ b/community/tightvnc/vncserver.service
@@ -0,0 +1,29 @@
+# The vncserver service unit file
+#
+# 1. Copy this file to /etc/systemd/system/vncserver@:<display>.service
+# 2. Edit User=
+#   ("User=foo")
+# 3. Edit  and vncserver parameters appropriately
+#   ("/usr/bin/vncserver %i -arg1 -arg2 -argn")
+# 4. Run `systemctl --system daemon-reload`
+# 5. Run `systemctl enable vncserver@:<display>.service`
+#
+# DO NOT RUN THIS SERVICE if your local area network is untrusted! 
+#
+# See the wiki page for more on security
+# https://wiki.archlinux.org/index.php/Vncserver
+
+[Unit]
+Description=Remote desktop service (VNC)
+After=syslog.target network.target
+
+[Service]
+Type=forking
+User=
+# Clean any existing files in /tmp/.X11-unix environment, especially useful for VMs
+ExecStartPre=-/usr/bin/vncserver -kill %i
+ExecStart=/usr/bin/vncserver %i
+ExecStop=/usr/bin/vncserver -kill %i
+
+[Install]
+WantedBy=multi-user.target