diff -Nru linux-backports-modules-3.5.0-3.5.0/debian/changelog linux-backports-modules-3.5.0-3.5.0/debian/changelog
--- linux-backports-modules-3.5.0-3.5.0/debian/changelog	2012-12-13 23:14:23.000000000 +0000
+++ linux-backports-modules-3.5.0-3.5.0/debian/changelog	2012-12-17 12:17:09.000000000 +0000
@@ -1,3 +1,18 @@
+linux-backports-modules-3.5.0 (3.5.0-21.7) UNRELEASED; urgency=low
+
+  [ Andy Whitcroft ]
+
+  * The hv_kvp_daemon is flavour specific when built from within LBM so
+    include the flavour to avoid collisions in /usr/sbin.
+    - LP: #1089970
+  * Fix up the hv updater to handle cleanups in the master source (non-source
+    change).
+  * Update daemon to latest to obtain the following fixes:
+   - hv_kvp_daemon -- prevent self-daemonising to allow upstart to track
+   - LP: #1078106
+ 
+ -- Andy Whitcroft <apw@canonical.com>  Mon, 17 Dec 2012 12:11:04 +0000
+
 linux-backports-modules-3.5.0 (3.5.0-21.6) quantal-proposed; urgency=low
 
   [ Andy Whitcroft ]
diff -Nru linux-backports-modules-3.5.0-3.5.0/debian/rules.d/2-binary-arch.mk linux-backports-modules-3.5.0-3.5.0/debian/rules.d/2-binary-arch.mk
--- linux-backports-modules-3.5.0-3.5.0/debian/rules.d/2-binary-arch.mk	2012-12-13 23:14:23.000000000 +0000
+++ linux-backports-modules-3.5.0-3.5.0/debian/rules.d/2-binary-arch.mk	2012-12-17 12:10:08.000000000 +0000
@@ -177,7 +177,7 @@
 
 	install -d $(hvpkgdir)/usr/sbin
 	install -s -m755 $(builddir)/build-$*/hv/tools/hv/hv_kvp_daemon \
-	       $(hvpkgdir)/usr/sbin/hv_kvp_daemon_$(release)-$(abinum)_lbm
+	       $(hvpkgdir)/usr/sbin/hv_kvp_daemon_$(release)-$(abinum)-$(target_flavour)
 
 	find $(hvpkgdir)/ -type f -name \*.ko -print | xargs -r strip --strip-debug
 
diff -Nru linux-backports-modules-3.5.0-3.5.0/updates/hv/tools/hv/hv_kvp_daemon.c linux-backports-modules-3.5.0-3.5.0/updates/hv/tools/hv/hv_kvp_daemon.c
--- linux-backports-modules-3.5.0-3.5.0/updates/hv/tools/hv/hv_kvp_daemon.c	2012-12-13 23:14:23.000000000 +0000
+++ linux-backports-modules-3.5.0-3.5.0/updates/hv/tools/hv/hv_kvp_daemon.c	2012-12-17 12:16:54.000000000 +0000
@@ -1415,7 +1415,9 @@
 	char	*if_name;
 	struct hv_kvp_ipaddr_value *kvp_ip_val;
 
+#if 0   /* It's much easier to manage from upstart if we don't fork */
 	daemon(1, 0);
+#endif
 	openlog("KVP", 0, LOG_USER);
 	syslog(LOG_INFO, "KVP starting; pid is:%d", getpid());
 	/*
diff -Nru linux-backports-modules-3.5.0-3.5.0/updates/hv/update linux-backports-modules-3.5.0-3.5.0/updates/hv/update
--- linux-backports-modules-3.5.0-3.5.0/updates/hv/update	2012-12-13 23:14:23.000000000 +0000
+++ linux-backports-modules-3.5.0-3.5.0/updates/hv/update	2012-12-17 12:15:56.000000000 +0000
@@ -17,5 +17,5 @@
 git rm tools/hv/*
 mkdir -p tools/hv
 cp -p "$raring"/tools/hv/* tools/hv
-sed -i -e 's@#include <linux/hyperv.h>@#include "hyperv.h"@' tools/hv/*.c
+sed -i -e 's@#include [<"].*/hyperv.h[">]@#include "hyperv.h"@' tools/hv/*.c
 git add tools/hv