diff --git a/.mailmap b/.mailmap
index 65e2c10871..a6744acb72 100644
--- a/.mailmap
+++ b/.mailmap
@@ -28,7 +28,8 @@
 <supriyak@linux.vnet.ibm.com> <supriyak@in.ibm.com>
 <neil@aldur.co.uk> <neil@brightbox.co.uk>
 <stefanb@us.ibm.com> <stefanb@linux.vnet.ibm.com>
-<josh.durgin@dreamhost.com> <joshd@hq.newdream.net>
+<josh.durgin@inktank.com> <joshd@hq.newdream.net>
+<josh.durgin@inktank.com> <josh.durgin@dreamhost.com>
 
 # Name consolidation:
 # Preferred author spelling <preferred email>
diff --git a/AUTHORS b/AUTHORS
index 375db24b49..0e179a9caa 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -144,7 +144,7 @@ Patches have also been contributed by:
   Hu Tao               <hutao@cn.fujitsu.com>
   Laurent Léonard      <laurent@open-minds.org>
   MORITA Kazutaka      <morita.kazutaka@lab.ntt.co.jp>
-  Josh Durgin          <josh.durgin@dreamhost.com>
+  Josh Durgin          <josh.durgin@inktank.com>
   Roopa Prabhu         <roprabhu@cisco.com>
   Paweł Krześniak      <pawel.krzesniak@gmail.com>
   Kay Schubert         <kayegypt@web.de>
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 48369d65ec..f51c99ab1f 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -847,6 +847,9 @@ qemuMigrationIsSafe(virDomainDefPtr def)
                     continue;
                 else if (cfs < 0)
                     return false;
+            } else if (disk->type == VIR_DOMAIN_DISK_TYPE_NETWORK &&
+                       disk->protocol == VIR_DOMAIN_DISK_PROTOCOL_RBD) {
+                continue;
             }
 
             qemuReportError(VIR_ERR_MIGRATE_UNSAFE, "%s",