diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE
index 15b7b5846d..3fae2e950b 100644
--- a/CHANGES_NEXT_RELEASE
+++ b/CHANGES_NEXT_RELEASE
@@ -19,5 +19,6 @@ Fix: Changed max-length of service path elements from 10 characteres to 50. (Iss
 Fix: Service path is no longer ignored at entity creation time for entities without type. (Issue #642)
 Fix: The broker crashed on receiving compounds for some convops, e.g. /v1/contextEntities/{entityId} (Issue #647)
 Fix: Using 443 as default port for "https" notifications. (Issue #639)
+Fix: Fixed RPM package so PID file is stored in /var/run/contextBroker instead of /var/log/contextBroker. (Issue #612)
 Fix: Payload no longer accepts 'operator' as part of a Scope. (Issue #618)
 Fix: Made compound attribute values for for convenience operations (Issue #660)
diff --git a/etc/config/contextBroker b/etc/config/contextBroker
index e53065f5d9..9dc1b51f1c 100644
--- a/etc/config/contextBroker
+++ b/etc/config/contextBroker
@@ -35,7 +35,7 @@ BROKER_PORT=1026
 BROKER_LOG_DIR=/var/log/contextBroker
 
 # BROKER_PID_FILE - Where to store the pid for orion-broker
-BROKER_PID_FILE=/var/log/contextBroker/contextBroker.pid
+BROKER_PID_FILE=/var/run/contextBroker/contextBroker.pid
 
 ## Database configuration for orion-broker
 BROKER_DATABASE_HOST=localhost
diff --git a/rpm/SPECS/contextBroker.spec b/rpm/SPECS/contextBroker.spec
index 702b51de1b..e7358df725 100644
--- a/rpm/SPECS/contextBroker.spec
+++ b/rpm/SPECS/contextBroker.spec
@@ -72,7 +72,9 @@ exit 0
 DATE=$(date "+%Y-%m-%d")
 /sbin/chkconfig --add %{name}
 mkdir -p /var/log/%{name}
+mkdir -p /var/run/%{name}
 chown -R %{owner}:%{owner} /var/log/%{name}
+chown -R %{owner}:%{owner} /var/run/%{name}
 # Secure the configuration file to prevent un-authorized access
 chown %{owner}:%{owner} /etc/sysconfig/%{name}
 chmod 600 /etc/sysconfig/%{name}
@@ -103,7 +105,8 @@ cp -R %{_sourcedir}/etc $RPM_BUILD_ROOT
 # it as part of our install script
 strip $RPM_BUILD_ROOT/usr/bin/contextBroker
 chmod 555 $RPM_BUILD_ROOT/usr/bin/contextBroker
-mkdir -p $RPM_BUILD_ROOT/var/%{name}
+#FIXME: I think next line is not actually needed, thus it has been commented out for a quarentine period (starting on 24/11/2014)
+#mkdir -p $RPM_BUILD_ROOT/var/%{name}
 mkdir -p $RPM_BUILD_ROOT/etc/init.d
 mkdir -p $RPM_BUILD_ROOT/etc/profile.d
 mkdir -p $RPM_BUILD_ROOT/usr/share/contextBroker/tests