diff --git a/src/dbus/qdbusmetaobject.cpp b/src/dbus/qdbusmetaobject.cpp
index 392eac60810..8337a84614a 100644
--- a/src/dbus/qdbusmetaobject.cpp
+++ b/src/dbus/qdbusmetaobject.cpp
@@ -220,8 +220,11 @@ QDBusMetaObjectGenerator::findType(const QByteArray &signature,
         } else if (signature == "a{sv}") {
             result.name = "QVariantMap";
             type = QVariant::Map;
+        } else if (signature == "a{ss}") {
+            result.name = "QMap<QString,QString>";
+            type = qMetaTypeId<QMap<QString, QString> >();
         } else {
-            result.name = "QDBusRawType::" + signature;
+            result.name = "{D-Bus type \"" + signature + "\"}";
             type = registerComplexDBusType(result.name);
         }
     } else {