diff --git a/solid/solid/backends/devinfo/devinfodevice.cpp b/solid/solid/backends/devinfo/devinfodevice.cpp
index 2a933ea4..87b07468 100644
--- a/solid/solid/backends/devinfo/devinfodevice.cpp
+++ b/solid/solid/backends/devinfo/devinfodevice.cpp
@@ -24,12 +24,17 @@
 #include "devinfonetworkinterface.h"
 #include "devinfographic.h"
 
+#include "kdevicedatabase.h"
+
 #include <QDebug>
 
 #include <sys/types.h>
 #include <sys/sysctl.h>
 #include <devinfo.h>
 
+
+static KDeviceDatabase s_devicedb;
+
 using namespace Solid::Backends::Devinfo;
 
 typedef QMap<DevinfoDevice::DeviceProperty, QByteArray> DevicePropertiesType;
@@ -132,9 +137,9 @@ QString DevinfoDevice::vendor() const
     const QByteArray parent = deviceProperty(DevinfoDevice::DeviceParent);
     QString result;
     if (parent.contains("pci")) {
-        result = m_devicedb.lookupPCIVendor(pnpvendor);
+        result = s_devicedb.lookupPCIVendor(pnpvendor);
     } else {
-        result = m_devicedb.lookupUSBVendor(pnpvendor);
+        result = s_devicedb.lookupUSBVendor(pnpvendor);
     }
 
     return result;
@@ -163,9 +168,9 @@ QString DevinfoDevice::product() const
     const QByteArray parent = deviceProperty(DevinfoDevice::DeviceParent);
     QString result;
     if (parent.contains("pci")) {
-        result = m_devicedb.lookupPCIDevice(pnpvendor, pnpdevice);
+        result = s_devicedb.lookupPCIDevice(pnpvendor, pnpdevice);
     } else {
-        result = m_devicedb.lookupUSBDevice(pnpvendor, pnpdevice);
+        result = s_devicedb.lookupUSBDevice(pnpvendor, pnpdevice);
     }
 
     return result;
diff --git a/solid/solid/backends/devinfo/devinfodevice.h b/solid/solid/backends/devinfo/devinfodevice.h
index 7aa63770..bfc6fc8e 100644
--- a/solid/solid/backends/devinfo/devinfodevice.h
+++ b/solid/solid/backends/devinfo/devinfodevice.h
@@ -24,8 +24,6 @@
 #include <solid/ifaces/device.h>
 #include <QtCore/QStringList>
 
-#include "kdevicedatabase.h"
-
 namespace Solid
 {
 namespace Backends
@@ -79,7 +77,6 @@ private:
     QString m_device;
     QMap<DeviceProperty, QByteArray> m_properties;
     QMap<PnPInfo, QByteArray> m_pnpinfo;
-    mutable KDeviceDatabase m_devicedb;
 };
 
 }
diff --git a/solid/solid/backends/udev/udevdevice.cpp b/solid/solid/backends/udev/udevdevice.cpp
index 5fc575dd..28c07b2c 100644
--- a/solid/solid/backends/udev/udevdevice.cpp
+++ b/solid/solid/backends/udev/udevdevice.cpp
@@ -39,6 +39,7 @@
 
 #include "kglobal.h"
 #include "klocale.h"
+#include "kdevicedatabase.h"
 
 #if defined(LIBCDIO_FOUND)
 #include "udevopticaldisc.h"
@@ -49,6 +50,8 @@
 
 using namespace Solid::Backends::UDev;
 
+static KDeviceDatabase s_devicedb;
+
 UDevDevice::UDevDevice(const UdevQt::Device device)
     : Solid::Ifaces::Device()
     , m_device(device)
@@ -101,9 +104,9 @@ QString UDevDevice::vendor() const
             if (!idvendorid.isEmpty()) {
                 const QString idbus(m_device.deviceProperty("ID_BUS"));
                 if (idbus == QLatin1String("pci")) {
-                    vendor = m_devicedb.lookupPCIVendor(idvendorid);
+                    vendor = s_devicedb.lookupPCIVendor(idvendorid);
                 } else if (idbus == QLatin1String("usb")) {
-                    vendor = m_devicedb.lookupUSBVendor(idvendorid);
+                    vendor = s_devicedb.lookupUSBVendor(idvendorid);
                 }
             }
         }
@@ -145,9 +148,9 @@ QString UDevDevice::product() const
             if (!idvendorid.isEmpty() && !idmodelid.isEmpty()) {
                 const QString idbus(m_device.deviceProperty("ID_BUS"));
                 if (idbus == QLatin1String("pci")) {
-                    product = m_devicedb.lookupPCIDevice(idvendorid, idmodelid);
+                    product = s_devicedb.lookupPCIDevice(idvendorid, idmodelid);
                 } else if (idbus == QLatin1String("usb")) {
-                    product = m_devicedb.lookupUSBDevice(idvendorid, idmodelid);
+                    product = s_devicedb.lookupUSBDevice(idvendorid, idmodelid);
                 }
             }
         }
diff --git a/solid/solid/backends/udev/udevdevice.h b/solid/solid/backends/udev/udevdevice.h
index c963a905..e1b83aae 100644
--- a/solid/solid/backends/udev/udevdevice.h
+++ b/solid/solid/backends/udev/udevdevice.h
@@ -22,7 +22,6 @@
 #define SOLID_BACKENDS_UDEV_UDEVDEVICE_H
 
 #include "udevqt.h"
-#include "kdevicedatabase.h"
 
 #include <solid/ifaces/device.h>
 #include <QtCore/QStringList>
@@ -64,7 +63,6 @@ private:
     friend class AcAdapter;
     friend class Battery;
     UdevQt::Device m_device;
-    mutable KDeviceDatabase m_devicedb;
 };
 
 }