diff --git a/Changelog b/Changelog
index 732d60ba..88efc142 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,8 @@
+* Mon Jan 29 2007 Jesse Keating <jkeating@redhat.com>
+- Update the comps file again from F7
+- Fix the ppc boot flags
+- Clean up SRPM-disc junk
+
 * Thu Jan 25 2007 Jesse Keating <jkeating@redhat.com>
 - Update the comps file from F7
 
diff --git a/config/comps-fc7.xml b/config/comps-fc7.xml
index 37863f70..67446942 100644
--- a/config/comps-fc7.xml
+++ b/config/comps-fc7.xml
@@ -2634,80 +2634,8 @@
       <packagereq type="default">rp-pppoe</packagereq>
       <packagereq type="default">wvdial</packagereq>
       <packagereq type="optional">efax</packagereq>
-      <packagereq type="optional">statserial</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>dialup</id>
-    <name>Dialup Networking Support</name>
-    <name xml:lang="af">Inbelnetwerksteun</name>
-    <name xml:lang="am">የመረቡ ደጋፊ ጋር ደውል</name>
-    <name xml:lang="ar">دعم شبكات الاتصال الهاتفي</name>
-    <name xml:lang="as">ডাইল্ কৰা জালপ্ৰসাৰৰ সমৰ্থন</name>
-    <name xml:lang="be">Падтрымка камутуемых злучэньняў</name>
-    <name xml:lang="bg">Поддръжка на Dailup мрежи</name>
-    <name xml:lang="bn">টেলিফোনের মাধ্যমে নেটওয়ার্কিং-এর ব্যবস্থা</name>
-    <name xml:lang="bn_IN">ডায়াল-আপ নেটওয়ার্কিং ব্যবস্থা</name>
-    <name xml:lang="ca">Suport per a la connexió a la xarxa</name>
-    <name xml:lang="cs">Podpora vytáčeného připojení k síti</name>
-    <name xml:lang="cy">Cynhaliaeth Rhwydweithio Cyswllt Ffôn</name>
-    <name xml:lang="da">Understøttelse for opkaldt opkobling</name>
-    <name xml:lang="de">Einwahl-Netzwerk Unterstützung</name>
-    <name xml:lang="el">Υποστήριξη δικτύωσης μέσω τηλεφώνου</name>
-    <name xml:lang="en_GB">Dial-up Networking Support</name>
-    <name xml:lang="es">Soporte de red mediante discado</name>
-    <name xml:lang="et">Sissehelistamise võrgu toetus</name>
-    <name xml:lang="fa">پشتیبانی از کار با شبکه از طریق خط تلفن</name>
-    <name xml:lang="fi">Tuki puhelinverkkoyhteyksille</name>
-    <name xml:lang="fr">Support d'accès distant au réseau</name>
-    <name xml:lang="gu">ડાયલઅપ નેટવર્કનો આધાર</name>
-    <name xml:lang="hi">ड़ायलअप संजालन समर्थन</name>
-    <name xml:lang="hr">Podrška za telefoniranje</name>
-    <name xml:lang="hu">Telefonos hálózati támogatás</name>
-    <name xml:lang="hy">Հեռախոսային միացման հնարավորություն</name>
-    <name xml:lang="id">Dukungan Dialup Networking</name>
-    <name xml:lang="is">Upphringinetsstuðningur</name>
-    <name xml:lang="it">Supporto di networking dialup</name>
-    <name xml:lang="ja">ダイヤルアップネットワークサポート</name>
-    <name xml:lang="kn">ದೂರವಾಣಿ ಮೂಲಕ ಜಾಲವ್ಯವಸ್ಥೆಯ ಸಮರ್ಥನೆ</name>
-    <name xml:lang="ko">전화연결 네트워킹 지원</name>
-    <name xml:lang="lv">Iezvanpiekļuve datortīkliem</name>
-    <name xml:lang="mk">Поддршка за модемска (dial-up) мрежа</name>
-    <name xml:lang="ml">ഡൈലപ്പ് നെറ്റ്വറ്‍ക്കിംഗ് സപ്പോറ്‍ട്ട്</name>
-    <name xml:lang="mr">डायलअप संजालन समर्थन</name>
-    <name xml:lang="ms">Sokongan Rangkaian Dailup</name>
-    <name xml:lang="nb">Støtte for oppringt nettverk</name>
-    <name xml:lang="nl">Inbelnetwerk ondersteuning</name>
-    <name xml:lang="no">Støtte for oppringt nettverk</name>
-    <name xml:lang="nso">Thekgo ya Neteweke ya go Taela</name>
-    <name xml:lang="or">ଡାଏଲ-ଅପ ନେଟୱାର୍କ ସହାୟତା</name>
-    <name xml:lang="pa">ਡਾਇਲਅੱਪ ਨੈੱਟਵਰਕ ਸਹਿਯੋਗ</name>
-    <name xml:lang="pl">Obsługa sieci dial-up</name>
-    <name xml:lang="pt">Suporte a Ligações Telefónicas</name>
-    <name xml:lang="pt_BR">Suporte à Rede Dialup</name>
-    <name xml:lang="ro">Suport pentru acces la reţea prin telefon</name>
-    <name xml:lang="ru">Удалённый доступ к сети</name>
-    <name xml:lang="si">ඩයල්අප් ජාල පහසුකම</name>
-    <name xml:lang="sk">Podpora telefonického pripojenia</name>
-    <name xml:lang="sl">Podpora telefonske priključitve</name>
-    <name xml:lang="sr">Подршка за телефонско умрежавање</name>
-    <name xml:lang="sr@Latn">Podrška za telefonsko umrežavanje</name>
-    <name xml:lang="sv">Stöd för uppringd uppkoppling</name>
-    <name xml:lang="ta">டயல்அப் பிணைய துணை</name>
-    <name xml:lang="te">Dialup Networking మద్దతు</name>
-    <name xml:lang="th">ระบบสนับสนุนการเชื่อมต่ออินเทอร์เน็ตด้วยสายโทรศัพท์</name>
-    <name xml:lang="tr">Çevirmeli Ağ Desteği</name>
-    <name xml:lang="uk">Віддалений доступ до мережі</name>
-    <name xml:lang="ur">ڈاليپ نیٹ وارک ساتھ</name>
-    <name xml:lang="vi">Hỗ trợ mạng quay số</name>
-    <name xml:lang="zh_CN">拨号联网支持</name>
-    <name xml:lang="zh_TW">撥號網路支援</name>
-    <name xml:lang="zu">Ukuxhasa Kokuxhumanisa Kokufona</name>
-    <description/>
-    <default>true</default>
-    <uservisible>false</uservisible>
-    <packagelist>
       <packagereq type="optional">pptp</packagereq>
+      <packagereq type="optional">statserial</packagereq>
     </packagelist>
   </group>
   <group>
@@ -13202,4 +13130,4 @@
       <groupid>virtualization</groupid>
     </grouplist>
   </category>
-</comps>
\ No newline at end of file
+</comps>
diff --git a/pypungi/pungi.py b/pypungi/pungi.py
index 7852425f..464f3b54 100755
--- a/pypungi/pungi.py
+++ b/pypungi/pungi.py
@@ -163,7 +163,7 @@ class Pungi:
         bootargs = ''
         x86bootargs = '-b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table'
         ia64bootargs = '-b images/boot.img -no-emul-boot'
-        ppcbootargs = '-part -hfs -r -l -sysid PPC -hfs-bless "./ppc/mac" -map %s -magic %s -no-desktop -allow-multidot -chrp-boot' % (os.path.join(anaruntime, 'mapping'), os.path.join(anaruntime, 'magic'))
+        ppcbootargs = '-part -hfs -r -l -sysid PPC -map %s -magic %s -no-desktop -allow-multidot -chrp-boot -hfs-bless' % (os.path.join(anaruntime, 'mapping'), os.path.join(anaruntime, 'magic'))
         isodir = os.path.join(self.config.get('default', 'destdir'), self.config.get('default', 'version'), 
             self.config.get('default', 'flavor'), self.config.get('default', 'arch'), self.config.get('default', 'isodir'))
         os.makedirs(isodir)
@@ -178,7 +178,7 @@ class Pungi:
                 elif self.config.get('default', 'arch') == 'ia64':
                     bootargs = ia64bootargs
                 elif self.config.get('default', 'arch') == 'ppc':
-                    bootargs = ppcbootargs
+                    bootargs = "%s %s" % (ppcbootargs, os.path.join('%s-disc%s' % (self.topdir, disc), "ppc/mac"))
             else:
                 bootargs = '' # clear out any existing bootargs
 
@@ -217,7 +217,7 @@ class Pungi:
             elif self.config.get('default', 'arch') == 'ia64':
                 bootargs = ia64bootargs
             elif self.config.get('default', 'arch') == 'ppc':
-                bootargs = ppcbootargs
+                bootargs = "%s %s" % (ppcbootargs, os.path.join(self.topdir, "ppc/mac"))
             else:
                 bootargs = '' # clear out any existing bootargs
             
@@ -237,39 +237,40 @@ class Pungi:
                 'repodata-%s' % self.config.get('default', 'arch')), os.path.join(self.topdir, 'repodata'))
 
         # Now make rescue images
-        os.system('/usr/lib/anaconda-runtime/mk-rescueimage.%s %s %s %s %s' % (
-            self.config.get('default', 'arch'),
-            self.topdir,
-            self.workdir,
-            self.config.get('default', 'iso_basename'),
-            self.config.get('default', 'product_path')))
+        if not self.config.get('default', 'arch') == 'source':
+            os.system('/usr/lib/anaconda-runtime/mk-rescueimage.%s %s %s %s %s' % (
+                self.config.get('default', 'arch'),
+                self.topdir,
+                self.workdir,
+                self.config.get('default', 'iso_basename'),
+                self.config.get('default', 'product_path')))
 
-        # write the iso
-        volname = '"%s %s %s Rescue"' % (self.config.get('default', 'product_name'), self.config.get('default', 'version'), 
-                self.config.get('default', 'arch')) # hacky :/
-        isoname = '%s-%s-%s-rescuecd.iso' % (self.config.get('default', 'iso_basename'), self.config.get('default', 'version'), 
-            self.config.get('default', 'arch'))
-        if self.config.get('default', 'arch') == 'i386' or self.config.get('default', 'arch') == 'x86_64':
-            bootargs = x86bootargs
-        elif self.config.get('default', 'arch') == 'ia64':
-            bootargs = ia64bootargs
-        elif self.config.get('default', 'arch') == 'ppc':
-            bootargs = ppcbootargs
-        else:
-            bootargs = '' # clear out any existing bootargs
+            # write the iso
+            volname = '"%s %s %s Rescue"' % (self.config.get('default', 'product_name'), self.config.get('default', 'version'), 
+                    self.config.get('default', 'arch')) # hacky :/
+            isoname = '%s-%s-%s-rescuecd.iso' % (self.config.get('default', 'iso_basename'), self.config.get('default', 'version'), 
+                self.config.get('default', 'arch'))
+            if self.config.get('default', 'arch') == 'i386' or self.config.get('default', 'arch') == 'x86_64':
+                bootargs = x86bootargs
+            elif self.config.get('default', 'arch') == 'ia64':
+                bootargs = ia64bootargs
+            elif self.config.get('default', 'arch') == 'ppc':
+                bootargs = "%s %s" % (ppcbootargs, os.path.join(self.workdir, "%s-rescueimage" % self.config.get('default', 'arch'), "ppc/mac"))
+            else:
+                bootargs = '' # clear out any existing bootargs
 
-        os.system('mkisofs %s %s %s -o %s/%s %s' % (mkisofsargs,
-                                                    volname,
-                                                    bootargs,
-                                                    isodir,
-                                                    isoname,
-                                                    os.path.join(self.workdir, "%s-rescueimage" % self.config.get('default', 'arch'))))
+            os.system('mkisofs %s %s %s -o %s/%s %s' % (mkisofsargs,
+                                                        volname,
+                                                        bootargs,
+                                                        isodir,
+                                                        isoname,
+                                                        os.path.join(self.workdir, "%s-rescueimage" % self.config.get('default', 'arch'))))
 
-        os.system('cd %s; sha1sum %s >> SHA1SUM' % (isodir, isoname))
+            os.system('cd %s; sha1sum %s >> SHA1SUM' % (isodir, isoname))
 
         # Do some clean up
         dirs = os.listdir(self.archdir)
 
         for dir in dirs:
-            if dir.startswith('os-disc'):
+            if dir.startswith('os-disc') or dir.startswith('SRPM-disc'):
                 shutil.move(os.path.join(self.archdir, dir), os.path.join(self.workdir, dir))