diff --git a/Changelog b/Changelog
index 080d0c48..ff5be54e 100644
--- a/Changelog
+++ b/Changelog
@@ -3,6 +3,7 @@
 - Move some items to cli flags only (part of moving to pykickstart)
 - make "product_name" "name" instead.  KISS
 - hard set product_path to 'Packages'
+- Use group metadata from repos instead of our own comps file
 
 * Thu Aug 23 2007 Jesse Keating <jkeating@redhat.com>
 - Add a source config for the Fedora spin
diff --git a/ToDo b/ToDo
index 23b84d2b..fbcfa174 100644
--- a/ToDo
+++ b/ToDo
@@ -26,11 +26,15 @@ DONE ^^
 DONE ^^
 
 * Make the following transitions
-  product_name -> name
-  product path == 'Packages/"
-  get comps data from repos
+  product_name -> name *DONE*
+  product path == 'Packages/" *DONE*
   cachedir == /var/cache/pungi ?
 
+* Get comps data from repos
+  Use ayum.comps.<whatever> to get comps information *DONE*
+  Snag each available comps file, cat them together, use xslt to make clean
+  Use this mutant comps for creating repodata in the destdirs.
+
 * From pykickstart
   manifest -> %packages
   yum-repos -> repo
@@ -39,7 +43,4 @@ DONE ^^
 * Release notes stuff
   Drop all stuff but GPL, README, GPG keys, potentially README-BURNING-ISOS ?
 
-* fedora-release
-  Provides: system-release = %{version}-%{release}
-
 * Profit!
diff --git a/pypungi/gather.py b/pypungi/gather.py
index f44b5c09..8036c15d 100755
--- a/pypungi/gather.py
+++ b/pypungi/gather.py
@@ -66,10 +66,6 @@ class Gather(pypungi.PungiBase):
         self.srpmlist = []
         self.resolved_deps = {} # list the deps we've already resolved, short circuit.
 
-        # Create a comps object and add our comps file for group definitions
-        self.compsobj = yum.comps.Comps()
-        self.compsobj.add(self.config.get('default', 'comps'))
-
         # Create a yum object to use
         self.ayum = PungiYum(config)
         self.ayum.doConfigSetup(fn=config.get('default', 'yumconf'), debuglevel=6, errorlevel=6, root=os.path.join(self.workdir, 'yumroot'))
@@ -169,12 +165,12 @@ class Gather(pypungi.PungiBase):
             group = group.split(' --nodefaults')[0]
 
         # Check if we have the group
-        if not self.compsobj.has_group(group):
+        if not self.ayum.comps.has_group(group):
             self.logger.error("Group %s not found in comps!" % group)
             return packages
 
         # Get the group object to work with
-        groupobj = self.compsobj.return_group(group)
+        groupobj = self.ayum.comps.return_group(group)
 
         # Add the mandatory packages
         packages.extend(groupobj.mandatory_packages.keys())