diff --git a/debian/diamond.default b/debian/diamond.default
index 42d28e47e..deda518f2 100644
--- a/debian/diamond.default
+++ b/debian/diamond.default
@@ -8,5 +8,5 @@
 
 # Additional options that are passed to the Daemon.
 ENABLE_DIAMOND="yes"
-DIAMOND_PID="/var/run/diamond/diamond.pid"
+DIAMOND_PID="/var/run/diamond.pid"
 DIAMOND_USER="diamond"
diff --git a/debian/dirs b/debian/dirs
index 98aef7bb0..f1461edd2 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -1,3 +1,2 @@
 etc/diamond/collectors
 var/log/diamond
-var/run/diamond
diff --git a/debian/upstart/diamond.conf b/debian/upstart/diamond.conf
index e9e5b7537..3cf116428 100644
--- a/debian/upstart/diamond.conf
+++ b/debian/upstart/diamond.conf
@@ -17,7 +17,7 @@ script
         . /etc/default/diamond
     else
         ENABLE_DIAMOND="yes"
-        DIAMOND_PID="/var/run/diamond/diamond.pid"
+        DIAMOND_PID="/var/run/diamond.pid"
         DIAMOND_USER="diamond"
     fi