diff --git a/pyopencl/__init__.py b/pyopencl/__init__.py
index 2cb9d08227e947a22e69f3cfe263f3925d73dec9..6e60f793baa87d702e75c08c2ba1d2abdaa931cb 100644
--- a/pyopencl/__init__.py
+++ b/pyopencl/__init__.py
@@ -350,8 +350,14 @@ def _add_functionality():
         return "<pyopencl.Device '%s' on '%s' at 0x%x>" % (
                 self.name.strip(), self.platform.name.strip(), self.int_ptr)
 
+    def device_persistent_unique_id(self):
+        return (self.vendor, self.vendor_id, self.name, self.version)
+
     Device.__repr__ = device_repr
 
+    # undocumented for now:
+    Device.persistent_unique_id = property(device_persistent_unique_id)
+
     # }}}
 
     # {{{ Context