2 files changed, 7 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index 25c5c04ab..f2f442576 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openssh (1:7.5p1-10) UNRELEASED; urgency=medium
+
+  * Tell haveged to create the pid file we expect.
+
+ -- Colin Watson <cjwatson@debian.org>  Fri, 01 Sep 2017 02:41:04 +0100
+
 openssh (1:7.5p1-9) unstable; urgency=medium
 
   * Run debian/tests/regress with "set -x".
diff --git a/debian/tests/regress b/debian/tests/regress
index e941be871..c6e3a15db 100755
--- a/debian/tests/regress
+++ b/debian/tests/regress
@@ -35,7 +35,7 @@ EOF
         if ! pidof haveged >/dev/null; then
                 start-stop-daemon --start --quiet \
                         --pidfile "$TMP/haveged.pid" \
-                        --exec /usr/sbin/haveged
+                        --exec /usr/sbin/haveged -- -p "$TMP/haveged.pid"
         fi
 
         sudo -u openssh-tests env TMP="$TMP" "$0" "$@"