diff --git a/Changelog b/Changelog
index 9b249576..141b3b0a 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,6 @@
+* Sat Feb 03 2007 Jesse Keating <jkeating@redhat.com>
+- Be able to opt-out of a bugurl since buildinstall supports this
+
 * Tue Jan 30 2007 Jesse Keating <jkeating@redhat.com>
 - implantmd5 _then_ sha1sum.
 
diff --git a/config/pungi.conf b/config/pungi.conf
index c850709d..67823a54 100644
--- a/config/pungi.conf
+++ b/config/pungi.conf
@@ -5,7 +5,6 @@
 product_name = Fedora Core
 product_path = Fedora
 iso_basename = FC
-bugurl = http://bugzilla.redhat.com
 comps = /etc/pungi/comps-fc7.xml
 manifest = /etc/pungi/minimal-manifest
 yumconf = /etc/pungi/yum.conf.x86_64
diff --git a/pypungi/pungi.py b/pypungi/pungi.py
index 60059246..b847e523 100755
--- a/pypungi/pungi.py
+++ b/pypungi/pungi.py
@@ -45,10 +45,13 @@ class Pungi:
         os.makedirs(os.path.join(self.topdir, self.config.get('default', 'product_path'), 'base'))
         shutil.copy(self.config.get('default', 'comps'), os.path.join(self.topdir, 
             self.config.get('default', 'product_path'), 'base', 'comps.xml'))
-        args = '--product "%s" --version %s --release "%s" --prodpath %s --bugurl "%s" %s' % (self.config.get('default', 'product_name'),
+        bugurl = ""
+        if self.config.has_option('default', 'bugurl'):
+            bugurl = "--bugurl %s" % self.config.get('default', 'bugurl')
+        args = '--product "%s" --version %s --release "%s" --prodpath %s %s %s' % (self.config.get('default', 'product_name'),
             self.config.get('default', 'version'), '%s %s' % (self.config.get('default', 'product_name'), 
             self.config.get('default', 'version')), self.config.get('default', 'product_path'), 
-            self.config.get('default', 'bugurl'), self.topdir)
+            bugurl, self.config.get('default', 'bugurl'), self.topdir)
         os.system('/usr/lib/anaconda-runtime/buildinstall %s' % args)
 
     def doPackageorder(self):