diff --git a/python-funcparserlib.changes b/python-funcparserlib.changes
index 9a0754e..7e6498d 100644
--- a/python-funcparserlib.changes
+++ b/python-funcparserlib.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Apr 19 19:47:05 UTC 2017 - toddrme2178@gmail.com
+
+- Implement single-spec version.
+
 -------------------------------------------------------------------
 Sun Mar 13 20:53:41 UTC 2016 - dmueller@suse.com
 
diff --git a/python-funcparserlib.spec b/python-funcparserlib.spec
index 2cd9bf1..ee6016d 100644
--- a/python-funcparserlib.spec
+++ b/python-funcparserlib.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-funcparserlib
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,6 +16,9 @@
 #
 
 
+%bcond_without tests
+
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-funcparserlib
 Version:        0.3.6
 Release:        0
@@ -23,16 +26,18 @@ Url:            http://code.google.com/p/funcparserlib/
 Summary:        Recursive descent parsing library based on functional combinators
 License:        MIT
 Group:          Development/Languages/Python
-Source:         http://pypi.python.org/packages/source/f/funcparserlib/funcparserlib-%{version}.tar.gz
+Source:         http://files.pythonhosted.org/packages/source/f/funcparserlib/funcparserlib-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  python-devel
-BuildRequires:  python-nose
-BuildRequires:  python-setuptools
-%if 0%{?suse_version} && 0%{?suse_version} <= 1110
-%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%else
-BuildArch:      noarch
+BuildRequires:  fdupes
+BuildRequires:  python-rpm-macros
+BuildRequires:  python3-2to3
+BuildRequires:  %{python_module devel}
+BuildRequires:  %{python_module setuptools}
+%if %{with tests}
+BuildRequires:  %{python_module nose}
 %endif
+BuildArch:      noarch
+%python_subpackages
 
 %description
 Parser combinators are just higher-order functions that take parsers as
@@ -57,21 +62,25 @@ as well as a tiny lexer generator for token position tracking.
 %setup -q -n funcparserlib-%{version}
 
 %build
-python setup.py build
+%python_build
 
 %install
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
+%python_install
+%python_expand %fdupes %{buildroot}%{$python_sitelib}
 
+%if %{with tests}
 %check
-# Python 2.6.0 has broken exceptions for tests
-%if %(python -c 'import sys; print int(sys.version.startswith("2.6 "))') == 0
-nosetests
+pushd doc
+%{python_expand export PYHONPATH=%{buildroot}%{$python_sitelib}
+nosetests-%{$python_bin_suffix} -m funcparserlib
+}
+popd
 %endif
 
-%files
+%files %{python_files}
 %defattr(-,root,root,-)
-%doc LICENSE README
-%{python_sitelib}/funcparserlib
+%doc LICENSE README CHANGES
+%{python_sitelib}/funcparserlib/
 %{python_sitelib}/funcparserlib*egg-info
 
 %changelog