Index: lib/python/opencsw_test.py
===================================================================
--- lib/python/opencsw_test.py	(revision 14880)
+++ lib/python/opencsw_test.py	(working copy)
@@ -399,6 +399,10 @@
     self.assertEquals("stuf_with_some_dashes",
                       opencsw.PkgnameToCatName("STUFwith-some-dashes"))
 
+  def testPkgnameToCatName5(self):
+    self.assertNotEquals(opencsw.PkgnameToCatName("SUNWi4rf"),
+                         opencsw.PkgnameToCatName("SUNWi7rf"))
+
   def test_4(self):
     pkginfo_dict = opencsw.ParsePkginfo(TEST_PKGINFO.splitlines())
     expected = "sunw_bash-11.10.0,REV=2005.01.08.01.09-SunOS5.10-i386-SUNW.pkg"
Index: lib/python/opencsw.py
===================================================================
--- lib/python/opencsw.py	(revision 14880)
+++ lib/python/opencsw.py	(working copy)
@@ -484,7 +484,7 @@
   casechange = [False] + [x != y for x, y in neighbors]
   str_list = [(cc * "_") + l.lower() for l, cc in zip(s, casechange)]
   s2 = "".join(str_list)
-  return re.findall(r"[a-z]+", s2)
+  return re.findall(r"[a-z0-9]+", s2)
 
 
 def CatalogNameGroupName(catalogname_list):