diff --git a/.gitignore b/.gitignore
index e4de73e..a37db5b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -138,3 +138,4 @@ pykickstart-1.78.tar.gz
 /pykickstart-1.99.64.tar.gz
 /pykickstart-1.99.65.tar.gz
 /pykickstart-1.99.66.tar.gz
+/pykickstart-2.0.tar.gz
diff --git a/pykickstart.spec b/pykickstart.spec
index 4dd7bb3..b226ba1 100644
--- a/pykickstart.spec
+++ b/pykickstart.spec
@@ -1,60 +1,139 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
 
-Summary:  A python library for manipulating kickstart files
-Name: pykickstart
-Url: http://fedoraproject.org/wiki/pykickstart
-Version: 1.99.66
-Release: 1%{?dist}
+Name:      pykickstart
+Version:   2.0
+Release:   1%{?dist}
+License:   GPLv2 and MIT
+Group:     System Environment/Libraries
+Summary:   Python utilities for manipulating kickstart files.
+Url:       http://fedoraproject.org/wiki/pykickstart
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
 # within this srpm.
-Source0: %{name}-%{version}.tar.gz
+Source0:   %{name}-%{version}.tar.gz
 
-License: GPLv2
-Group: System Environment/Libraries
 BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: python-devel, gettext, python-setuptools
-BuildRequires: python-urlgrabber
+
+BuildRequires: gettext
+BuildRequires: python-devel
+BuildRequires: python-setuptools
+BuildRequires: python-requests
 %if ! 0%{?rhel}
 BuildRequires: transifex-client
 %endif
-Requires: python, python-urlgrabber
+BuildRequires: python3-devel
+BuildRequires: python3-setuptools
+BuildRequires: python3-six
+
+Requires: python3-kickstart
 
 %description
-The pykickstart package is a python library for manipulating kickstart
-files.
+Python utilities for manipulating kickstart files.  The Python 2 and 3 libraries
+can be found in the packages python-kickstart and python3-kickstart
+respectively.
+
+# Python 2 library
+%package -n python-kickstart
+Summary:  Python 2 library for manipulating kickstart files.
+Requires: python-six
+
+%description -n python-kickstart
+Python 2 library for manipulating kickstart files.  The binaries are found in
+the pykickstart package.
+
+# Python 3 library
+%package -n python3-kickstart
+Summary:  Python 3 library for manipulating kickstart files.
+Requires: python-six
+
+%description -n python3-kickstart
+Python 3 library for manipulating kickstart files.  The binaries are found in
+the pykickstart package.
 
 %prep
 %setup -q
 
+rm -rf %{py3dir}
+mkdir %{py3dir}
+cp -a . %{py3dir}
+
 %build
 make
 
+pushd %{py3dir}
+PYTHON=%{__python3} make
+popd
+
 %install
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 %find_lang %{name}
 
-%clean
-rm -rf %{buildroot}
+pushd %{py3dir}
+PYTHON=%{__python3} make DESTDIR=%{buildroot} install
+popd
 
 %check
 make test
 
-%files -f %{name}.lang
+pushd %{py3dir}
+PYTHON=%{__python3} make DESTDIR=%{buildroot} test
+popd
+
+%files
 %defattr(-,root,root,-)
 %license COPYING
-%doc README docs/programmers-guide
-%doc docs/kickstart-docs.txt
-%{python_sitelib}/*
+%doc README
 %{_bindir}/ksvalidator
 %{_bindir}/ksflatten
 %{_bindir}/ksverdiff
 %{_bindir}/ksshell
 %{_mandir}/man1/*
 
+%files -n python-kickstart -f %{name}.lang
+%defattr(-,root,root,-)
+%doc docs/programmers-guide
+%doc docs/kickstart-docs.txt
+%{python_sitelib}/pykickstart*egg*
+%{python_sitelib}/pykickstart/*py*
+%{python_sitelib}/pykickstart/commands/*py*
+%{python_sitelib}/pykickstart/handlers/*py*
+
+%files -n python3-kickstart -f %{name}.lang
+%defattr(-,root,root,-)
+%doc docs/programmers-guide
+%doc docs/kickstart-docs.txt
+%{python3_sitelib}/pykickstart*egg*
+%{python3_sitelib}/pykickstart/*py*
+%{python3_sitelib}/pykickstart/commands/*py*
+%{python3_sitelib}/pykickstart/handlers/*py*
+
 %changelog
+* Fri Feb 20 2015 Chris Lumens <clumens@redhat.com> - 1.99.67-1
+- Make sure pykickstart requires some version of the library. (clumens)
+- Split into python2 and python3 specific packages. (clumens)
+- Look for translations in their new location. (clumens)
+- Install .mo files into the python site-packages directory. (clumens)
+- Merge pull request #3 from tradej/python3 (clumens)
+- Fixed pylint warnings (tradej)
+- Fixed executables in tools + related parts of pykickstart.parser. (tradej)
+- Explicitly closing files. Python 3 tests work now. (tradej)
+- Implemented rich comparison for parser.Group. (tradej)
+- Error parsing in test.commands.logvol matches Python 3's optparse. (tradej)
+- Keeping order of contents in the %packages section with OrderedSet (under MIT license). (tradej)
+- Redefined _ in pykickstart.i18n, importing. (tradej)
+- Fixed assertRaisesRegexp function in Python3. (tradej)
+- Replaced string.strip(pkgs) with str(pkgs).strip(). (tradej)
+- Adapted Makefile to allow running tests under Python 3. (tradej)
+- Converted syntax to Python 3-compatible (rhbz#985310) (tradej)
+- Fix a problem pylint caught with the last patch merge. (clumens)
+- Make sure pykickstart/*/*py messages get included in pykickstart.pot. (clumens)
+- Merge pull request #2 from tradej/urlgrabber (clumens)
+- Replaced URLGrabber with requests (rhbz#1141245) (tradej)
+- Remove --nobase as an option. (clumens)
+- Add support to rhel6 for specifying thin pool profile (vpodzime)
+- Add support to rhel6 for custom layouts using lvm thin provisioning. (dlehman)
+
 * Fri Jan 30 2015 Chris Lumens <clumens@redhat.com> - 1.99.66-1
 - network: add support for bridge to F22 (#1075195) (rvykydal)
 - Use %license in pykickstart.spec (bcl)
diff --git a/sources b/sources
index faa495c..fca198c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a69e33771264062e0286844168a68394  pykickstart-1.99.66.tar.gz
+e24ee0a9e736548e4d2359fb8e30686c  pykickstart-2.0.tar.gz