diff -up sos-2.2/sos/plugins/openhpi.py.orig sos-2.2/sos/plugins/openhpi.py
--- sos-2.2/sos/plugins/openhpi.py.orig	2013-10-07 17:37:39.089946688 +0100
+++ sos-2.2/sos/plugins/openhpi.py	2013-10-07 17:37:40.861952731 +0100
@@ -25,10 +25,6 @@ class openhpi(sos.plugintools.PluginBase
         ])
 
     def postproc(self):
-        self.doRegexSub("/etc/openhpi/openhpi.conf"
-                        r'([Pp]assw(or)?d|[Pp]assphrase)[[:space:]]+\=[[:space:]]"(.*)"',
-                        r"\1******")
-        self.doRegexSub("/etc/openhpi/openhpiclient.conf"
-                        r'([Pp]assw(or)?d|[Pp]assphrase)[[:space:]]+\=[[:space:]]"(.*)"',
-                        r"\1******")
+        self.doRegexSub("/etc/openhpi/openhpi.conf",
+                        r'(\s*[Pp]ass.*\s*=\s*).*', r'\1********')