init.d/migrate-run.in |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/init.d/migrate-run.in b/init.d/migrate-run.in
index 4eec687..ae52e5d 100644
--- a/init.d/migrate-run.in
+++ b/init.d/migrate-run.in
@@ -19,12 +19,18 @@ start()
 stop()
 {
 	einfo "completing /var/run and /var/lock migration."
-	if [ -d /run -a ! -L /var/lock -a ! -L /var/run ]; then
-		ebegin "Migrating /var/lock and /var/run to /run"
-		rm -rf /var/lock /var/run
-		ln -s /var/lock /run/lock
-		ln -s /var/run /run
-		eend 0
+	if [ -d /run/lock -a ! -L /var/lock ]; then
+		ebegin "Migrating /var/lock to /run"
+		rm -rf /var/lock
+		ln -s ../run/lock /var/lock
+		eend $?
+	fi
+
+	if [ -d /run -a ! -L /var/run ]; then
+		ebegin "Migrating /var/run to /run"
+		rm -rf /var/run
+		ln -s ../run /var/run
+		eend $?
 	fi
 	return 0
 }