diff --git a/.mailmap b/.mailmap
index 652c5856fa..824df36e33 100644
--- a/.mailmap
+++ b/.mailmap
@@ -13,3 +13,4 @@
 <jfehlig@novell.com> <jfehlig@linux-ypgk.site>
 <jclift@redhat.com> <justin@salasaga.org>
 <berrange@redhat.com> <dan@berrange.com>
+<soren@canonical.com> <soren@linux2go.dk>
diff --git a/src/util/util.c b/src/util/util.c
index 8f2a17e6f9..c173e491d0 100644
--- a/src/util/util.c
+++ b/src/util/util.c
@@ -2367,7 +2367,7 @@ const char *virEnumToString(const char *const*types,
 int virDiskNameToIndex(const char *name) {
     const char *ptr = NULL;
     int idx = 0;
-    static char const* const drive_prefix[] = {"fd", "hd", "vd", "sd", "xvd"};
+    static char const* const drive_prefix[] = {"fd", "hd", "vd", "sd", "xvd", "ubd"};
     unsigned int i;
 
     for (i = 0; i < ARRAY_CARDINALITY(drive_prefix); i++) {