diff --git a/tigervnc.spec b/tigervnc.spec
index fa8f54e..1213a93 100644
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@ -2,7 +2,7 @@
 
 Name:		tigervnc
 Version:	1.0.90
-Release:	0.25.%{snap}%{?dist}
+Release:	0.26.%{snap}%{?dist}
 Summary:	A TigerVNC remote display system
 
 Group:		User Interface/Desktops
@@ -296,6 +296,9 @@ fi
 %doc LICENCE.TXT
 
 %changelog
+* Wed Dec 15 2010 Jan Görig <jgorig redhat com> 1.0.90-0.26.20101208svn4225
+- added vncserver lock file (#662784)
+
 * Fri Dec 10 2010 Adam Tkac <atkac redhat com> 1.0.90-0.25.20101208svn4225
 - update to r4225
 - patches merged
diff --git a/vncserver.init b/vncserver.init
index 4e420bd..304f0d8 100644
--- a/vncserver.init
+++ b/vncserver.init
@@ -63,6 +63,7 @@ start() {
         if [ "$RETVAL" -eq 0 ]; then
 	    success $"vncserver startup"
 	    touch /var/lock/subsys/Xvnc
+	    touch /var/lock/subsys/vncserver
         else 
             failure $"vncserver start"
         fi
@@ -99,7 +100,7 @@ stop() {
     [ "$RETVAL" -eq 0 ] && success $"vncserver shutdown" || \
 	failure $"vncserver shutdown"
     echo
-    [ "$RETVAL" -eq 0 ] && rm -f /var/lock/subsys/Xvnc
+    [ "$RETVAL" -eq 0 ] && (rm -f /var/lock/subsys/Xvnc ; rm -f /var/lock/subsys/vncserver)
     return "$RETVAL"
 }