diff --git a/Changelog b/Changelog
index 68200c55..da1ee5d8 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,6 @@
+* Fri Apr 06 2007 Jesse Keating <jkeating@redhat.com>
+- Fix comments in config file
+
 * Mon Apr 02 2007 Jesse Keating <jkeating@redhat.com>
 - Remove incompatible fc6 config files
 - Update default config file with comments / new options
diff --git a/config/pungi.conf b/config/pungi.conf
index 55040683..ee2d10dd 100644
--- a/config/pungi.conf
+++ b/config/pungi.conf
@@ -1,20 +1,21 @@
 # Pungi config file
 #
+# # or ; can be used at the start of a line, ; only to comment inline.
 
 [default]
-product_name = Fedora # The name used during install
-product_path = Fedora # The directory where RPMS go
-iso_basename = F # The first part of the iso file name
-bugurl = http://bugzilla.redhat.com # Used for betanag
-comps = /etc/pungi/comps-fc7.xml # Used to define package groupings and default installs
-manifest = /etc/pungi/minimal-manifest # Used to determine what to bring in.  Supports Kickstart syntax
-yumconf = /etc/pungi/yum.conf.x86_64 # Used to determine where to gather packages from
-destdir = /srv/pungi/Fedora # Top level compose directory, must be clean
-cachedir = /srv/pungi/cache # Cache used for repeat runs
-arch = x86_64 # What arch to compose (must be same arch as system)
-version = development # Used both in install and part of the dest tree
-flavor = Custom # Further define a given cut of the package set
-discs = 1 # Number of discs needed to fit data.
-#cdsize = 4608.0 Not used if disc count is 1
-getsource = Yes # Used to determine if we want source packages or not
+product_name = Fedora ; The name used during install
+product_path = Fedora ; The directory where RPMS go
+iso_basename = F ; The first part of the iso file name
+bugurl = http://bugzilla.redhat.com ; Used for betanag
+comps = /etc/pungi/comps-fc7.xml ; Used to define package groupings and default installs
+manifest = /etc/pungi/minimal-manifest ; Used to determine what to bring in.  Supports Kickstart syntax
+yumconf = /etc/pungi/yum.conf.x86_64 ; Used to determine where to gather packages from
+destdir = /srv/pungi/Fedora ; Top level compose directory, must be clean
+cachedir = /srv/pungi/cache ; Cache used for repeat runs
+arch = x86_64 ; What arch to compose (must be same arch as system)
+version = development ; Used both in install and part of the dest tree
+flavor = Custom ; Further define a given cut of the package set
+discs = 1 ; Number of discs needed to fit data.
+#cdsize = 4608.0 ; Not used if disc count is 1
+getsource = Yes ; Used to determine if we want source packages or not
 
diff --git a/pungi b/pungi
index 9b5b08e8..ede2cbb2 100755
--- a/pungi
+++ b/pungi
@@ -140,7 +140,7 @@ if __name__ == '__main__':
     import sys
 
     def get_arguments():
-        parser = OptionParser(version="%prog 0.3.0")
+        parser = OptionParser(version="%prog 0.3.1")
         parser.add_option("--destdir", default="*CONFFILE*", dest="destdir",
           help='destination directory (defaults to current directory)')
         parser.add_option("-c", "--conf", default='/etc/pungi/pungi.conf', dest="config",
diff --git a/pungi.spec b/pungi.spec
index abf7f56e..3fc05c20 100644
--- a/pungi.spec
+++ b/pungi.spec
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           pungi
-Version:        0.3.0
+Version:        0.3.1
 Release:        1%{?dist}
 Summary:        Distribution compose tool
 
@@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Apr 06 2007 Jesse Keating <jkeating@redhat.com> - 0.3.1-1
+- Fix comments in default config file
+
 * Mon Apr 02 2007 Jesse Keating <jkeating@redhat.com> - 0.3.0-1
 - Remove incompatible fc6 config files
 - Update default config file with comments / new options
diff --git a/setup.py b/setup.py
index 4ef9abe1..b29ead37 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from distutils.core import setup
 import glob
 
 setup(name='pungi',
-      version='0.3.0',
+      version='0.3.1',
       description='Distribution compose tool',
       author='Jesse Keating',
       author_email='jkeating@redhat.com',