diff --git a/sos/plugins/puppet.py b/sos/plugins/puppet.py
index dedb7ae642..cdf37f2ce5 100644
--- a/sos/plugins/puppet.py
+++ b/sos/plugins/puppet.py
@@ -24,7 +24,23 @@ def setup(self):
             "/etc/puppet/*.conf",
             "/etc/puppet/rack/*",
             "/etc/puppet/manifests/*",
-            "/var/log/puppet/*.log",
+            "/etc/puppet/ssl/ca/inventory.txt",
+            "/var/log/puppet/*.log*",
+            "/etc/puppetlabs/puppet/*.conf",
+            "/etc/puppetlabs/puppetserver/conf.d/*.conf",
+            "/etc/puppetlabs/puppet/rack/*",
+            "/etc/puppetlabs/puppet/manifests/*",
+            "/etc/puppetlabs/puppet/ssl/ca/inventory.txt",
+            "/var/log/puppetlabs/puppetserver/*.log*",
+            "/var/lib/puppetlabs/puppet/ssl/ca/inventory.txt",
+            "/var/lib/puppet/ssl/ca/inventory.txt"
+        ])
+
+        self.add_cmd_output([
+            'facter',
+            'puppet --version',
+            'ls -lanR /etc/puppet/modules',
+            'ls -lanR /etc/puppetlabs/code/modules'
         ])
 
     def postproc(self):