diff --git a/drbd.changes b/drbd.changes
index 9178775..f2df696 100644
--- a/drbd.changes
+++ b/drbd.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jul 10 07:51:21 UTC 2012 - tserong@suse.com
+
+- Don't use /var/lock/subsys in init script (bnc#714643)
+
 -------------------------------------------------------------------
 Fri Dec 16 03:45:16 UTC 2011 - tserong@suse.com
 
diff --git a/drbd.spec b/drbd.spec
index aa0565c..a6978fd 100644
--- a/drbd.spec
+++ b/drbd.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package drbd
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 Name:           drbd
 BuildRequires:  bison
 BuildRequires:  flex
@@ -26,7 +27,8 @@ Version:        8.3.11
 Release:        0
 Source:         %{name}-%{version}.tar.bz2
 Patch1:         init-script-fixes.diff
-Provides:       drbdsetup drbd-control
+Provides:       drbd-control
+Provides:       drbdsetup
 Url:            http://www.drbd.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires(post): %insserv_prereq %fillup_prereq
diff --git a/init-script-fixes.diff b/init-script-fixes.diff
index ae53b7a..b266462 100644
--- a/init-script-fixes.diff
+++ b/init-script-fixes.diff
@@ -1,4 +1,6 @@
---- scripts/drbd
+Index: scripts/drbd
+===================================================================
+--- scripts/drbd.orig
 +++ scripts/drbd
 @@ -9,8 +9,8 @@
  #
@@ -11,3 +13,19 @@
  # Should-Start:   sshd multipathd
  # Should-Stop:    sshd multipathd
  # Default-Start:  2 3 4 5
+@@ -184,7 +184,6 @@ case "$1" in
+ 	    done
+ 	done
+ 
+-	[ -d /var/lock/subsys ] && touch /var/lock/subsys/drbd	# for RedHat
+ 	$DRBDADM wait-con-int # User interruptible version of wait-connect all
+ 
+ 	$DRBDADM sh-b-pri all # Become primary if configured
+@@ -211,7 +210,6 @@ case "$1" in
+ 		_udev_settle &> /dev/null
+ 		$RMMOD drbd
+ 	fi
+-	[ -f /var/lock/subsys/drbd ] && rm /var/lock/subsys/drbd
+ 	log_end_msg 0
+ 	;;
+     status)