diff -up sos-2.2/sos/plugins/rhn.py.orig sos-2.2/sos/plugins/rhn.py
--- sos-2.2/sos/plugins/rhn.py.orig	2012-03-06 16:33:35.648748925 +0000
+++ sos-2.2/sos/plugins/rhn.py	2012-03-06 16:33:38.357748986 +0000
@@ -72,13 +72,8 @@ class rhn(sos.plugintools.PluginBase):
             self.addCopySpec("/etc/tnsnames.ora")   
             self.addCopySpec("/etc/jabberd")
 
-            # tomcat (4.x and newer satellites only)
-            if not self.policy().pkgNVRA(satellite)[1].startswith("3."):
-               self.addCopySpec("/etc/tomcat5")
-               self.addCopySpec("/var/log/tomcat5")
-
-            self.addCopySpec("/etc/tomcat5/")
-            self.addCopySpec("/var/log/tomcat5/")
+            self.addCopySpec("/etc/tomcat6/")
+            self.addCopySpec("/var/log/tomcat6/")
 
         if self.proxy:
             # copying configuration information