diff --git a/mrepo b/mrepo
index cf9b4a4..7f29a68 100755
--- a/mrepo
+++ b/mrepo
@@ -474,7 +474,8 @@ class Dist:
                 os_components = (
                     glob.glob(pathjoin(self.dir + '/disc1/*/base/comps.xml')) +  # RHEL 4
                     glob.glob(pathjoin(self.dir + '/disc1/*/repodata/comps-*-core.xml')) +  # RHEL 5
-                    glob.glob(pathjoin(self.dir + '/disc1/repodata/*-comps*.xml')) +  # RHEL 6 / CentOS 6
+                    glob.glob(pathjoin(self.dir + '/disc1/repodata/*-comps*.xml')) +  # RHEL 6
+                    glob.glob(pathjoin(self.dir + '/disc1/repodata/*-comps.xml')) +  # CentOS 6
                     glob.glob(pathjoin(self.dir + '/disc1/repodata/comps.xml'))  # Scientific Linux 6
                 )
 
@@ -890,7 +891,7 @@ class Repo:
 
         ### Find the createrepo version we are using (due to groupfile usage changes)
         createrepo_version = None
-        groupfilename = 'RPMS.%s/comps.xml' % self.name
+        groupfilename = 'comps.xml'
 
         sys.path.append("/usr/share/createrepo")
         try:
@@ -909,8 +910,8 @@ class Repo:
         ### If version < 0.4.6, then use the old createrepo behaviour
         if not createrepo_version:
             error(0, '%s: Version of createrepo could not be found. Assuming newer than 0.4.6.' % self.dist.nick)
-        elif vercmp(createrepo_version, '0.4.6') > 0:
-            groupfilename = 'comps.xml'
+        elif vercmp(createrepo_version, '0.4.6') < 0:
+            groupfilename = 'RPMS.%s/comps.xml' % self.name
 
         opts = ' ' + cf.createrepooptions
         if op.force: