diff -Nru qemu-2.5+dfsg/debian/changelog qemu-2.5+dfsg/debian/changelog
--- qemu-2.5+dfsg/debian/changelog	2016-11-23 11:27:28.000000000 +0000
+++ qemu-2.5+dfsg/debian/changelog	2017-01-23 14:13:42.000000000 +0000
@@ -1,3 +1,12 @@
+qemu (1:2.5+dfsg-5ubuntu10.8) xenial; urgency=medium
+
+  [ Dmitrii Shcherbakov ]
+  *  d/p/ubuntu/net-fix-qemu_announce_self-not-emitting-packets.patch:
+     Cherrypick upstream patch: net: fix qemu_announce_self not emitting
+     packets (LP: #1656480)
+
+ -- Christian Ehrhardt <christian.ehrhardt@canonical.com>  Mon, 23 Jan 2017 15:12:05 +0100
+
 qemu (1:2.5+dfsg-5ubuntu10.7) xenial; urgency=medium
 
   [ Rafael David Tinoco ]
diff -Nru qemu-2.5+dfsg/debian/patches/series qemu-2.5+dfsg/debian/patches/series
--- qemu-2.5+dfsg/debian/patches/series	2016-11-22 12:41:06.000000000 +0000
+++ qemu-2.5+dfsg/debian/patches/series	2017-01-23 14:11:35.000000000 +0000
@@ -92,3 +92,4 @@
 CVE-2016-9105.patch
 CVE-2016-9106.patch
 vhost_migration-blocker-only-if-shared-log-is-used.patch
+ubuntu/net-fix-qemu_announce_self-not-emitting-packets.patch
diff -Nru qemu-2.5+dfsg/debian/patches/ubuntu/net-fix-qemu_announce_self-not-emitting-packets.patch qemu-2.5+dfsg/debian/patches/ubuntu/net-fix-qemu_announce_self-not-emitting-packets.patch
--- qemu-2.5+dfsg/debian/patches/ubuntu/net-fix-qemu_announce_self-not-emitting-packets.patch	1970-01-01 00:00:00.000000000 +0000
+++ qemu-2.5+dfsg/debian/patches/ubuntu/net-fix-qemu_announce_self-not-emitting-packets.patch	2017-01-23 14:11:35.000000000 +0000
@@ -0,0 +1,24 @@
+Description: net: fix qemu_announce_self not emitting packets
+  commit fefe2a78 accidentally dropped the code path for injecting
+  raw packets. This feature is needed for sending gratuitous ARPs
+  after an incoming migration has completed. The result is increased
+  network downtime for vservers where the network card is not virtio-net
+  with the VIRTIO_NET_F_GUEST_ANNOUNCE feature.
+
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/qemu/+bug/1656480
+Origin: upstream, http://git.qemu.org/?p=qemu.git;a=commitdiff;h=ca1ee3d6b546e841a1b9db413eb8fa09f13a061b
+Applied-Upstream: ca1ee3d6b546e841a1b9db413eb8fa09f13a061b
+Last-Update: 2017-01-14
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/net/net.c
++++ b/net/net.c
+@@ -735,7 +735,7 @@
+         return 0;
+     }
+ 
+-    if (nc->info->receive_iov) {
++    if (nc->info->receive_iov && !(flags & QEMU_NET_PACKET_FLAG_RAW)) {
+         ret = nc->info->receive_iov(nc, iov, iovcnt);
+     } else {
+         ret = nc_sendv_compat(nc, iov, iovcnt, flags);