diff -Nru libvirt-2.1.0/debian/changelog libvirt-2.1.0/debian/changelog
--- libvirt-2.1.0/debian/changelog	2016-08-24 07:23:27.000000000 -0500
+++ libvirt-2.1.0/debian/changelog	2016-08-31 09:03:24.000000000 -0500
@@ -1,3 +1,9 @@
+libvirt (2.1.0-1ubuntu5) yakkety; urgency=medium
+
+  * Fix libvirt start failure when security_driver set (LP: #1618592)
+
+ -- Jon Grimm <jon.grimm@canonical.com>  Wed, 31 Aug 2016 09:03:24 -0500
+
 libvirt (2.1.0-1ubuntu4) yakkety; urgency=medium
 
   * Enable systemtap, zfs, numa on s390x.
diff -Nru libvirt-2.1.0/debian/patches/series libvirt-2.1.0/debian/patches/series
--- libvirt-2.1.0/debian/patches/series	2016-08-17 02:50:01.000000000 -0500
+++ libvirt-2.1.0/debian/patches/series	2016-08-31 08:50:06.000000000 -0500
@@ -54,3 +54,4 @@
 ubuntu/0003-apparmor-debian-ubuntu-delta.patch
 ubuntu/0004-apparmor-ubuntu-delta.patch
 ubuntu/virt-aa-helper-fix-R.patch
+ubuntu/fix-qemu.conf-security_driver.patch
diff -Nru libvirt-2.1.0/debian/patches/ubuntu/fix-qemu.conf-security_driver.patch libvirt-2.1.0/debian/patches/ubuntu/fix-qemu.conf-security_driver.patch
--- libvirt-2.1.0/debian/patches/ubuntu/fix-qemu.conf-security_driver.patch	1969-12-31 18:00:00.000000000 -0600
+++ libvirt-2.1.0/debian/patches/ubuntu/fix-qemu.conf-security_driver.patch	2016-08-31 08:50:06.000000000 -0500
@@ -0,0 +1,33 @@
+From 856965b36246b26002af409262846317477ea631 Mon Sep 17 00:00:00 2001
+From: Cole Robinson <crobinso@redhat.com>
+Date: Wed, 10 Aug 2016 10:32:03 -0400
+Subject: [PATCH] qemu: fix qemu.conf security_driver
+
+Since a9331394 (first release v2.1.0), specifying a manual
+security_driver setting in qemu.conf causes the daemon to fail to
+start, erroring with 'Duplicate security driver X'.
+
+The duplicate checking was incorrectly comparing every entry
+against itself, guaranteeing a false positive.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1365607
+---
+ src/qemu/qemu_conf.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
+index b51f36f..7b971f1 100644
+--- a/src/qemu/qemu_conf.c
++++ b/src/qemu/qemu_conf.c
+@@ -436,7 +436,7 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg,
+         goto cleanup;
+ 
+     for (i = 0; cfg->securityDriverNames && cfg->securityDriverNames[i] != NULL; i++) {
+-        for (j = i; cfg->securityDriverNames[j] != NULL; j++) {
++        for (j = i + 1; cfg->securityDriverNames[j] != NULL; j++) {
+             if (STREQ(cfg->securityDriverNames[i],
+                       cfg->securityDriverNames[j])) {
+                 virReportError(VIR_ERR_CONF_SYNTAX,
+-- 
+2.9.3
+