diff --git a/README.dox b/README.dox
index 6c3eb92..d34d1ae 100644
--- a/README.dox
+++ b/README.dox
@@ -357,7 +357,7 @@ This can be achieved by adding --single-instance to the invoker command:
 \endverbatim
 
 As a result, a lock file 
-\c /tmp/single-instance-locks/\<application_name\>/instance.lock is created. 
+\c /var/run/single-instance-locks/\<application_name\>/instance.lock is created. 
 If applauncherd cannot acquire the lock, it tries to find the corresponding
 window and activates it.
 
diff --git a/debian/changelog b/debian/changelog
index 32850f4..c7e11c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 applauncherd (0.25.1) unstable; urgency=low
 
-  * Fixes: NB#241927 - QML boosted applications have incorrect MApplication::objectName 
+  * Fixes: NB#241927 - QML boosted applications have incorrect MApplication::objectName
+  * Lock file moved to /var/run
 
  -- Jussi Lind <jussi.lind@nokia.com>  Thu, 31 Mar 2011 17:13:21 +0300
 
diff --git a/src/launcherlib/daemon.cpp b/src/launcherlib/daemon.cpp
index f99f74d..19a5b91 100644
--- a/src/launcherlib/daemon.cpp
+++ b/src/launcherlib/daemon.cpp
@@ -114,7 +114,7 @@ bool Daemon::lock()
     fl.l_start = 0;
     fl.l_len = 1;
 
-    if((m_lockFd = open("/tmp/applauncherd.lock", O_WRONLY | O_CREAT, 0666)) == -1)
+    if((m_lockFd = open("/var/run/applauncherd.lock", O_WRONLY | O_CREAT, 0666)) == -1)
         return false;
 
     if(fcntl(m_lockFd, F_SETLK, &fl) == -1)
diff --git a/src/qdeclarativebooster/README-QDECLARATIVEBOOSTER b/src/qdeclarativebooster/README-QDECLARATIVEBOOSTER
index 6d29f86..addeb9f 100644
--- a/src/qdeclarativebooster/README-QDECLARATIVEBOOSTER
+++ b/src/qdeclarativebooster/README-QDECLARATIVEBOOSTER
@@ -178,7 +178,7 @@ This can be achieved by adding --single-instance to the invoker command:
   Name=com.nokia.<application_name>
   Exec=/usr/bin/invoker --single-instance --type=d /usr/bin/<application_name>
  
-As a result, a lock file /tmp/single-instance-locks/<application_name>/instance.lock 
+As a result, a lock file /var/run/single-instance-locks/<application_name>/instance.lock 
 is created.  If applauncherd cannot acquire the lock, it tries to find the
 corresponding window and activates it.
 
diff --git a/src/single-instance/main.cpp b/src/single-instance/main.cpp
index 0024e6a..bdbaf91 100644
--- a/src/single-instance/main.cpp
+++ b/src/single-instance/main.cpp
@@ -36,7 +36,7 @@
 namespace
 {
     int g_lockFd = -1;
-    const std::string LOCK_PATH_BASE("/tmp/single-instance-locks/");
+    const std::string LOCK_PATH_BASE("/var/run/single-instance-locks/");
     const std::string LOCK_FILE_NAME("instance.lock");
 }
 
@@ -238,7 +238,7 @@ extern "C"
      * \brief Try to acquire a lock file.
      *
      * Tries to acquire a lock currently at
-     * /tmp/single-instance-locks/[binaryName]/instance.lock
+     * /var/run/single-instance-locks/[binaryName]/instance.lock
      *
      * \param binaryName Full path to the binary.
      * \return true if succeeded, false on failure.
diff --git a/tests/harmattan/testscripts/utils.py b/tests/harmattan/testscripts/utils.py
index 1a982bc..975fb99 100644
--- a/tests/harmattan/testscripts/utils.py
+++ b/tests/harmattan/testscripts/utils.py
@@ -28,7 +28,7 @@ def remove_applauncherd_runtime_files():
     Removes files that applauncherd leaves behind after it has been stopped
     """
     debug("Removing files that applauncherd leaves behind after it has been stopped")
-    files = ['/tmp/applauncherd.lock']
+    files = ['/var/run/applauncherd.lock']
     files += glob.glob('/tmp/boost*')
 
     for f in files:
diff --git a/tests/meego/testscripts/utils.py b/tests/meego/testscripts/utils.py
index 450c2c0..72a07df 100644
--- a/tests/meego/testscripts/utils.py
+++ b/tests/meego/testscripts/utils.py
@@ -28,7 +28,7 @@ def remove_applauncherd_runtime_files():
     Removes files that applauncherd leaves behind after it has been stopped
     """
 
-    files = ['/tmp/applauncherd.lock']
+    files = ['/var/run/applauncherd.lock']
     files += glob.glob('/tmp/boost*')
 
     for f in files: