diff --git a/.gitignore b/.gitignore
index b60866c..d30d16b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ coverage-3.4.tar.gz
 /coverage-3.5.1b1.tar.gz
 /coverage-3.5.2b1.tar.gz
 /coverage-3.5.3.tar.gz
+/coverage-3.6b1.tar.gz
diff --git a/python-coverage.spec b/python-coverage.spec
index 5d950a8..49ff957 100644
--- a/python-coverage.spec
+++ b/python-coverage.spec
@@ -2,7 +2,7 @@
 %global with_python3 1
 %endif
 
-# %%global betaver b1
+%global betaver b1
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
@@ -13,13 +13,12 @@
 
 Name:           python-coverage
 Summary:        Code coverage testing module for Python
-Version:        3.5.3
-Release:        2%{?dist}
+Version:        3.6
+Release:        0.1.%{?betaver}%{?dist}
 License:        BSD and (MIT or GPLv2)
 Group:          System Environment/Libraries
 URL:            http://nedbatchelder.com/code/modules/coverage.html
-Source0:        http://pypi.python.org/packages/source/c/coverage/coverage-%{version}.tar.gz
-Patch0:         python-coverage-3.5.3-pickle.patch
+Source0:        http://pypi.python.org/packages/source/c/coverage/coverage-%{version}%{?betaver}.tar.gz
 BuildRequires:  python-setuptools, python-devel
 Requires:       python-setuptools
 %if 0%{?with_python3}
@@ -49,9 +48,7 @@ have been executed.
 %endif # with_python3
 
 %prep
-%setup -q -n coverage-%{version}
-
-%patch0 -p1
+%setup -q -n coverage-%{version}%{?betaver}
 
 find . -type f -exec chmod 0644 \{\} \;
 sed -i 's/\r//g' README.txt
@@ -86,11 +83,15 @@ popd
 %files
 %doc README.txt
 %{_bindir}/coverage
+%{_bindir}/coverage2
+%{_bindir}/coverage-2*
 %{python_sitearch}/coverage/
 %{python_sitearch}/coverage*.egg-info/
 
 %if 0%{?with_python3}
 %files -n python3-coverage
+%{_bindir}/coverage-3*
+%{_bindir}/coverage3
 %{_bindir}/python3-coverage
 %{python3_sitearch}/coverage/
 %{python3_sitearch}/coverage*.egg-info/
@@ -98,6 +99,10 @@ popd
 
 
 %changelog
+* Thu Nov 29 2012 Tom Callaway <spot@fedoraproject.org> - 3.6-0.1.b1
+- update to 3.6beta1
+- patch0 merged into upstream
+
 * Wed Oct 10 2012 Toshio Kuratomi <toshio@fedoraproject.org> - 3.5.3-2
 - Patch from upstream for traceback when people use this with python2 and
   python3 in the same directory
diff --git a/sources b/sources
index fea98f7..ef9674d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5f1f523940c473faa8a9f6ca29f78efc  coverage-3.5.3.tar.gz
+9363480582977076795455b524188263  coverage-3.6b1.tar.gz