diff --git a/Changelog b/Changelog
index b20349b1..482eef7c 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,6 @@
+* Fri May 25 2007 Jesse Keating <jkeating@redhat.com>
+- Handle the cdsize variable correctly
+
 * Thu May 24 2007 Jesse Keating <jkeating@redhat.com>
 - Use a package checksum to verify cached download
 - Use the right flavor in the Everything configs
diff --git a/pungi b/pungi
index e0633eaf..f71176ba 100755
--- a/pungi
+++ b/pungi
@@ -28,7 +28,7 @@ def main():
     sourcedir = "source"
     debugdir = "debug"
     isodir = "iso"
-    cdsize = "685.0"
+    cdsize = 685.0
     relnotefilere = "eula.txt fedora.css GPL README-BURNING-ISOS-en_US.txt RELEASE-NOTES-en_US.html ^RPM-GPG"
     relnotedirre = "images stylesheet-images"
     relnotepkgs = "fedora-release fedora-release-notes"
@@ -144,7 +144,7 @@ if __name__ == '__main__':
     import sys
 
     def get_arguments():
-        parser = OptionParser(version="%prog 0.3.5")
+        parser = OptionParser(version="%prog 0.3.6")
         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 964bd0b5..459b9e71 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.5
+Version:        0.3.6
 Release:        1%{?dist}
 Summary:        Distribution compose tool
 
@@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri May 25 2007 Jesse Keating <jkeating@redhat.coM> - 0.3.6-1
+- Handle the cdsize variable correctly
+
 * Thu May 24 2007 Jesse Keating <jkeating@redhat.coM> - 0.3.5-1
 - Use the right flavor in the Everything configs
 
diff --git a/setup.py b/setup.py
index 9e8dedc9..be7e5d07 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from distutils.core import setup
 import glob
 
 setup(name='pungi',
-      version='0.3.5',
+      version='0.3.6',
       description='Distribution compose tool',
       author='Jesse Keating',
       author_email='jkeating@redhat.com',