diff -Nru varnish-3.0.2/debian/changelog varnish-3.0.2/debian/changelog
--- varnish-3.0.2/debian/changelog	2011-10-29 13:24:10.000000000 +0000
+++ varnish-3.0.2/debian/changelog	2012-06-18 19:27:57.000000000 +0000
@@ -1,3 +1,11 @@
+varnish (3.0.2-1ubuntu0.1) precise-proposed; urgency=low
+
+  * varnish.init:
+    - Remove PID file on stop (LP: #1014793).
+    - Use start-stop-daemon for status.
+
+ -- Jonathan Davies <jonathan.davies@canonical.com>  Mon, 18 Jun 2012 19:53:22 +0100
+
 varnish (3.0.2-1) unstable; urgency=low
 
   * New upstream release
diff -Nru varnish-3.0.2/debian/control varnish-3.0.2/debian/control
--- varnish-3.0.2/debian/control	2011-10-29 13:24:10.000000000 +0000
+++ varnish-3.0.2/debian/control	2012-06-18 18:59:16.000000000 +0000
@@ -1,7 +1,8 @@
 Source: varnish
 Section: web
 Priority: optional
-Maintainer: Varnish Package Maintainers <pkg-varnish-devel@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Varnish Package Maintainers <pkg-varnish-devel@lists.alioth.debian.org>
 Uploaders: Stig Sandbeck Mathisen <ssm@debian.org>,
  Lars Bahner <bahner@debian.org>,
  Tollef Fog Heen <tfheen@debian.org>
diff -Nru varnish-3.0.2/debian/varnish.init varnish-3.0.2/debian/varnish.init
--- varnish-3.0.2/debian/varnish.init	2011-10-29 13:24:10.000000000 +0000
+++ varnish-3.0.2/debian/varnish.init	2012-06-18 18:53:11.000000000 +0000
@@ -73,6 +73,15 @@
     else
         log_end_msg 1
     fi
+    
+    if test -r $PIDFILE; then
+        read -r PID < $PIDFILE
+        if test ! -d /proc/$PID ; then
+            # stale pidfile
+            unset PID
+            rm -f $PIDFILE
+        fi
+    fi
 }
 
 reload_varnishd() {
@@ -85,7 +94,9 @@
 }
 
 status_varnishd() {
-    status_of_proc -p "${PIDFILE}" "${DAEMON}" "${NAME}"
+    start-stop-daemon \
+        --status --quiet --pidfile $PIDFILE \
+        --exec $DAEMON
     exit $?
 }