diff --git a/tigervnc.spec b/tigervnc.spec
index a0342c6..6681880 100644
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@ -340,6 +340,7 @@ fi
 
 %changelog
 * Wed Jul 24 2013 Tim Waugh <twaugh@redhat.com> 1.3.0-3
+- Avoid PIDFile problems in systemd unit file (bug #983232).
 - libvnc.so: don't use unexported key_is_down function.
 - Don't use shebang in vncserver script.
 
diff --git a/vncserver.service b/vncserver.service
index aff52b9..3976e02 100644
--- a/vncserver.service
+++ b/vncserver.service
@@ -34,11 +34,10 @@ Description=Remote desktop service (VNC)
 After=syslog.target network.target
 
 [Service]
-Type=forking
+Type=simple
 # Clean any existing files in /tmp/.X11-unix environment
 ExecStartPre=/bin/sh -c '/usr/bin/vncserver -kill %i > /dev/null 2>&1 || :'
-ExecStart=/sbin/runuser -l <USER> -c "/usr/bin/vncserver %i"
-ExecStop=/sbin/runuser -l <USER> -c "/usr/bin/vncserver -kill %i"
+ExecStart=/sbin/runuser -l <USER> -c "/usr/bin/vncserver -fg %i"
 
 [Install]
 WantedBy=multi-user.target