diff --git a/.gitignore b/.gitignore
index 557505e..d62f862 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ coverage-3.4.tar.gz
 /coverage-3.6b1.tar.gz
 /coverage-3.6b3.tar.gz
 /coverage-3.6.tar.gz
+/coverage-3.7.tar.gz
diff --git a/python-coverage.spec b/python-coverage.spec
index 48ca5e3..82e29c5 100644
--- a/python-coverage.spec
+++ b/python-coverage.spec
@@ -2,7 +2,10 @@
 %global with_python3 1
 %endif
 
-%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%{!?python_sitearch: %global python_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
+%{!?python2_shortver: %global python2_shortver %(%{__python2} -c 'import sys; print(str(sys.version_info.major) + "." + str(sys.version_info.minor))')}
+%{!?python3_shortver: %global python3_shortver %(%{__python3} -c 'import sys; print(str(sys.version_info.major) + "." + str(sys.version_info.minor))')}
 
 # tracer.so is a private object, don't include it in the provides
 %global _use_internal_dependency_generator 0
@@ -11,13 +14,13 @@
 
 Name:           python-coverage
 Summary:        Code coverage testing module for Python
-Version:        3.6
-Release:        2%{?dist}
+Version:        3.7
+Release:        1%{?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
-BuildRequires:  python-setuptools, python-devel
+BuildRequires:  python-setuptools, python2-devel
 Requires:       python-setuptools
 %if 0%{?with_python3}
 BuildRequires:  /usr/bin/2to3
@@ -60,7 +63,7 @@ popd
 %endif # if with_python3
 
 %build
-%{__python} setup.py build
+%{__python2} setup.py build
 
 %if 0%{?with_python3}
 pushd %{py3dir}
@@ -76,13 +79,32 @@ mv %{buildroot}/%{_bindir}/coverage %{buildroot}/%{_bindir}/python3-coverage
 popd
 %endif # if with_python3
 
-%{__python} setup.py install --skip-build --root %{buildroot}
+%{__python2} setup.py install --skip-build --root %{buildroot}
+
+# rename binaries, make compat symlinks
+pushd %{buildroot}%{_bindir}
+mv coverage python-coverage
+
+rm -rf coverage-2* coverage2
+
+for i in python2-coverage coverage coverage2 coverage-%{?python2_shortver}; do
+  ln -s python-coverage $i
+done
+
+rm -rf coverage-3* coverage3
+
+for i in coverage3 coverage-%{?python3_shortver}; do
+  ln -s	python3-coverage $i
+done
+popd
 
 %files
 %doc README.txt
 %{_bindir}/coverage
 %{_bindir}/coverage2
 %{_bindir}/coverage-2*
+%{_bindir}/python-coverage
+%{_bindir}/python2-coverage
 %{python_sitearch}/coverage/
 %{python_sitearch}/coverage*.egg-info/
 
@@ -97,6 +119,11 @@ popd
 
 
 %changelog
+* Sun Oct 20 2013 Tom Callaway <spot@fedoraproject.org> - 3.7-1
+- update to 3.7
+- fix macros for current guidelines
+- rename binary (with compat symlinks)
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
@@ -156,10 +183,10 @@ popd
 * Wed Jul 21 2010 David Malcolm <dmalcolm@redhat.com> - 3.3.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
 
-* Wed May 9 2010 Toshio Kuratomi <toshio@fedoraproject.org> - 3.3.1-2
+* Wed May 5 2010 Toshio Kuratomi <toshio@fedoraproject.org> - 3.3.1-2
 - Fix license tag, permissions, and filtering extraneous provides
 
-* Wed May 9 2010 Toshio Kuratomi <toshio@fedoraproject.org> - 3.3.1-1
+* Wed May 5 2010 Toshio Kuratomi <toshio@fedoraproject.org> - 3.3.1-1
 - Update to 3.3.1
 
 * Fri Feb  5 2010 David Malcolm <dmalcolm@redhat.com> - 3.2-3
@@ -174,7 +201,7 @@ popd
 * Fri Oct 16 2009 Luke Macken <lmacken@redhat.com> - 3.1-1
 - Update to 3.1
 
-* Wed Aug 10 2009 Tom "spot" Callaway <tcallawa@redhat.com> - 3.0.1-1
+* Wed Aug 12 2009 Tom "spot" Callaway <tcallawa@redhat.com> - 3.0.1-1
 - update to 3.0.1
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.85-3
diff --git a/sources b/sources
index c36acb7..4cd1fbf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-67d4e393f4c6a5ffc18605409d2aa1ac  coverage-3.6.tar.gz
+055d82e6849d882ec6cf2ae1faca8e56  coverage-3.7.tar.gz