diff --git a/tools/sdbus++ b/tools/sdbus++
index 26969f3..6cfcb9e 100755
--- a/tools/sdbus++
+++ b/tools/sdbus++
@@ -15,7 +15,8 @@
                        'server-header': "server_header",
                        'server-cpp': "server_cpp",
                        'exception-header': "exception_header",
-                       'exception-cpp': "exception_cpp"}
+                       'exception-cpp': "exception_cpp",
+                       'client-header': "client_header"}
 
     parser = argparse.ArgumentParser(description='Process sdbus++ YAML files.')
 
diff --git a/tools/sdbusplus/interface.py b/tools/sdbusplus/interface.py
index 29f41e4..e6251b3 100644
--- a/tools/sdbusplus/interface.py
+++ b/tools/sdbusplus/interface.py
@@ -60,3 +60,6 @@
 
     def server_cpp(self, loader):
         return self.render(loader, "interface.mako.server.cpp", interface=self)
+
+    def client_header(self, loader):
+        return self.render(loader, "interface.mako.client.hpp", interface=self)
diff --git a/tools/sdbusplus/templates/interface.mako.client.hpp b/tools/sdbusplus/templates/interface.mako.client.hpp
new file mode 100644
index 0000000..c615ced
--- /dev/null
+++ b/tools/sdbusplus/templates/interface.mako.client.hpp
@@ -0,0 +1,25 @@
+#pragma once
+
+<%
+    namespaces = interface.name.split('.')
+    classname = namespaces.pop()
+%>
+namespace sdbusplus
+{
+% for s in namespaces:
+namespace ${s}
+{
+% endfor
+namespace client
+{
+namespace ${classname}
+{
+
+static constexpr auto interface = "${interface.name}";
+
+} // namespace ${classname}
+} // namespace client
+% for s in reversed(namespaces):
+} // namespace ${s}
+% endfor
+} // namespace sdbusplus