diff --git a/tigervnc.spec b/tigervnc.spec
index 4e4eff3..6643468 100644
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@ -1,6 +1,6 @@
 Name:		tigervnc
 Version:	1.1.0
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	A TigerVNC remote display system
 
 Group:		User Interface/Desktops
@@ -296,6 +296,9 @@ fi
 %doc LICENCE.TXT
 
 %changelog
+* Mon Mar 26 2012 Adam Tkac <atkac redhat com> - 1.1.0-5
+- clean Xvnc's /tmp environment in service file before startup
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/vncserver.service b/vncserver.service
index 32255e2..4e0b141 100644
--- a/vncserver.service
+++ b/vncserver.service
@@ -34,6 +34,7 @@ After=syslog.target network.target
 
 [Service]
 Type=forking
+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"