diff --git a/debian/patches/flush-startup-output.patch b/debian/patches/flush-startup-output.patch
new file mode 100644
index 0000000..b957efb
--- /dev/null
+++ b/debian/patches/flush-startup-output.patch
@@ -0,0 +1,15 @@
+Description: flush output after printing the startup message, to avoid
+ confusion of the service "starting up" after receiving sigterm.
+Author: Dimitri John Ledkov <xnox@ubuntu.com>
+
+
+--- a/src/haveged.c
++++ b/src/haveged.c
+@@ -655,6 +655,7 @@ static void run_daemon(    /* RETURN: no
+      havege_reparent(handle);
+    }
+    else printf ("%s starting up\n", params->daemon);
++   fflush(NULL);
+    if (0 != havege_run(h))
+       error_exit("Couldn't initialize HAVEGE rng %d", h->error);
+    if (0 != (params->verbose & H_DEBUG_INFO))
diff --git a/debian/patches/series b/debian/patches/series
index 89d2846..c92984a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 debian/0001-shm-directory.patch
+flush-startup-output.patch