diff -Nru pollinate-4.15/debian/changelog pollinate-4.15/debian/changelog
--- pollinate-4.15/debian/changelog	2016-03-09 22:37:41.000000000 +0000
+++ pollinate-4.15/debian/changelog	2016-05-06 16:23:01.000000000 +0000
@@ -1,3 +1,24 @@
+pollinate (4.15-0ubuntu1.2) xenial-proposed; urgency=medium
+
+  * pollinate:
+    - use the right flag file for LP: #1578833
+
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Fri, 06 May 2016 11:22:39 -0500
+
+pollinate (4.15-0ubuntu1.1) xenial-updates; urgency=medium
+
+  [ Martin Pitt ]
+  * Don't run pollinate.service in containers (as containers can't and should
+    not write the host's random pool) and when we already have a saved random
+    seeds (i. e. only on first boot). (LP: #1578833)
+  * Bump Standards-Version to 3.9.8 (no changes needed).
+
+  [ Dustin Kirkland ]
+  * pollinate: use timeout(1) to limit curl, related to LP: #1578833
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Fri, 06 May 2016 11:10:05 -0500
+
 pollinate (4.15-0ubuntu1) xenial; urgency=medium
 
   * pollinate: LP: #1555362
diff -Nru pollinate-4.15/debian/control pollinate-4.15/debian/control
--- pollinate-4.15/debian/control	2014-12-06 00:00:14.000000000 +0000
+++ pollinate-4.15/debian/control	2016-05-06 16:12:00.000000000 +0000
@@ -7,7 +7,7 @@
  autotools-dev,
  autoconf,
  automake,
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Homepage: http://launchpad.net/pollinate
 
 Package: pollinate
diff -Nru pollinate-4.15/debian/patches/1578833 pollinate-4.15/debian/patches/1578833
--- pollinate-4.15/debian/patches/1578833	1970-01-01 00:00:00.000000000 +0000
+++ pollinate-4.15/debian/patches/1578833	2016-05-06 16:13:02.000000000 +0000
@@ -0,0 +1,53 @@
+Description: Fix LP: #1578833
+ pollinate (4.15-0ubuntu1.1) xenial-updates; urgency=medium
+ .
+   [ Martin Pitt ]
+   * Don't run pollinate.service in containers (as containers can't and should
+     not write the host's random pool) and when we already have a saved random
+     seeds (i. e. only on first boot). (LP: #1578833)
+   * Bump Standards-Version to 3.9.8 (no changes needed).
+ .
+   [ Dustin Kirkland ]
+   * pollinate: use timeout(1) to limit curl, related to LP: #1578833
+Author: Dustin Kirkland <kirkland@ubuntu.com>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1578833
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- pollinate-4.15.orig/pollinate
++++ pollinate-4.15/pollinate
+@@ -118,7 +118,7 @@ exchange() {
+ 	local out="${TMPDIR}/out"
+ 	local err="${TMPDIR}/err"
+ 	user_agent
+-	if ! curl -A "${USER_AGENT}" -o- -v --trace-time --connect-timeout ${WAIT} --max-time ${WAIT} --data @${f1} ${CURL_OPTS} ${server} >"${out}" 2>"${err}"; then
++	if ! timeout "${WAIT}" curl -A "${USER_AGENT}" -o- -v --trace-time --data @${f1} ${CURL_OPTS} ${server} >"${out}" 2>"${err}"; then
+ 		warning "Network communication failed [$?]\n$(cat ${out} ${err})"
+ 	fi
+ 	if [ "${NO_CHALLENGE}" != "1" ]; then
+--- pollinate-4.15.orig/pollinate.1
++++ pollinate-4.15/pollinate.1
+@@ -44,10 +44,10 @@ test communications with the \fBpollen\f
+ silence any log messages
+ .TP
+ \fB-w|--wait\fP WAIT
+-time in seconds you're willing to wait for a response from the server
++time in seconds you're willing to wait for a response from the server, uses \fBtimeout\fP(1)
+ 
+ .SH SEE ALSO
+-\fBpollen\fP(8)
++\fBpollen\fP(8), \fBtimeout\fP(1)
+ 
+ .SH AUTHOR
+ This manpage and the utility were written by Dustin Kirkland <kirkland@ubuntu.com> for Ubuntu systems (but may be used by others).  Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 3 published by the Free Software Foundation.
diff -Nru pollinate-4.15/debian/patches/series pollinate-4.15/debian/patches/series
--- pollinate-4.15/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ pollinate-4.15/debian/patches/series	2016-05-06 16:12:42.000000000 +0000
@@ -0,0 +1 @@
+1578833
diff -Nru pollinate-4.15/debian/pollinate.service pollinate-4.15/debian/pollinate.service
--- pollinate-4.15/debian/pollinate.service	2015-03-08 00:01:44.000000000 +0000
+++ pollinate-4.15/debian/pollinate.service	2016-05-06 16:22:31.000000000 +0000
@@ -3,6 +3,8 @@
 DefaultDependencies=no
 After=sysinit.target
 Before=ssh.service
+ConditionVirtualization=!container
+ConditionPathExists=!/var/cache/pollinate/seeded
 
 [Service]
 User=pollinate