diff --git a/.cvsignore b/.cvsignore
index 2a747d07..b5347460 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-pungi-1.2.18.tar.bz2
+pungi-2.0.0.tar.bz2
diff --git a/import.log b/import.log
new file mode 100644
index 00000000..d51c5211
--- /dev/null
+++ b/import.log
@@ -0,0 +1 @@
+pungi-2_0_0-1_fc9:HEAD:pungi-2.0.0-1.fc9.src.rpm:1213448247
diff --git a/pungi.spec b/pungi.spec
index 457c7fd7..633f5dd2 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:        1.2.18
+Version:        2.0.0
 Release:        1%{?dist}
 Summary:        Distribution compose tool
 
@@ -10,7 +10,7 @@ License:        GPLv2
 URL:            https://fedorahosted.org/pungi
 Source0:        https://fedorahosted.org/pungi/attachment/wiki/%{version}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:       anaconda-runtime >= 11.4.0.67, yum => 3.2.13, repoview, createrepo >= 0.4.11
+Requires:       anaconda-runtime >= 11.4.1.5, yum => 3.2.13, repoview, createrepo >= 0.4.11
 BuildRequires:  python-devel
 
 BuildArch:      noarch
@@ -55,6 +55,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jun 13 2008 Jesse Keating <jkeating@redhat.com> - 2.0.0-1
+- New major release
+- Collapse the two classes into one Pungi class
+- Create a pypungi.util module for utility functions
+- Pass along repos/mirrorlists configured in ks file to buildinstall
+- Repo cost is now "cost" in pykickstart
+
 * Tue May 06 2008 Jesse Keating <jkeating@redhat.com> - 1.2.18-1
 - Manifest change for F9, drop syslog-ng
 
diff --git a/sources b/sources
index aed79a26..20fbbe5a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3eef85bd4125cbf313addeeb27eb284a  pungi-1.2.18.tar.bz2
+5fb868714d985c78185c04f7803cc750  pungi-2.0.0.tar.bz2