diff --git a/client.h b/client.h
--- a/client.h
+++ b/client.h
@@ -689,7 +689,7 @@
 template <typename T>
 inline void Client::print(T &stream) const
 {
-    stream << "\'ID:" << window() << ";WMCLASS:" << resourceClass() << ":"
+    stream << "\'Client:" << window() << ";WMCLASS:" << resourceClass() << ":"
            << resourceName() << ";Caption:" << caption() << "\'";
 }
 
diff --git a/client.cpp b/client.cpp
--- a/client.cpp
+++ b/client.cpp
@@ -1772,6 +1772,7 @@
 
 void Client::debug(QDebug& stream) const
 {
+    stream.nospace();
     print<QDebug>(stream);
 }
 
diff --git a/shell_client.cpp b/shell_client.cpp
--- a/shell_client.cpp
+++ b/shell_client.cpp
@@ -425,8 +425,9 @@
 
 void ShellClient::debug(QDebug &stream) const
 {
-    // TODO: implement
-    Q_UNUSED(stream)
+    stream.nospace();
+    stream << "\'ShellClient:" << surface() << ";WMCLASS:" << resourceClass() << ":"
+           << resourceName() << ";Caption:" << caption() << "\'";
 }
 
 Layer ShellClient::layerForDock() const