diff --git a/.gitignore b/.gitignore
index 3ad1178..944da99 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /pymemcache-1.2.5.tar.gz
+/pymemcache-2.1.1.tar.gz
diff --git a/python-pymemcache.spec b/python-pymemcache.spec
index 66a10a6..7245447 100644
--- a/python-pymemcache.spec
+++ b/python-pymemcache.spec
@@ -1,17 +1,17 @@
 # Created by pyp2rpm-1.0.1
 %global pypi_name pymemcache
 
-%if 0%{?fedora}
-%global with_python3 1
-%endif
-
-%if 0%{?rhel} && 0%{?rhel} <= 6
-%{!?__python2: %global __python2 /usr/bin/python}
+%if 0%{?fedora} || 0%{?rhel} > 7
+%bcond_with    python2
+%bcond_without python3
+%else
+%bcond_without python2
+%bcond_with    python3
 %endif
 
 Name:           python-%{pypi_name}
-Version:        1.2.5
-Release:        16%{?dist}
+Version:        2.1.1
+Release:        1%{?dist}
 Summary:        A comprehensive, fast, pure Python memcached client
 
 License:        ASL 2.0
@@ -31,11 +31,36 @@ pymemcache supports the following features:\
 
 %description %_description
 
-%if 0%{?with_python3}
+
+%if %{with python2}
+%package -n python2-%{pypi_name}
+Summary:        A comprehensive, fast, pure Python memcached client
+BuildRequires:  python2-devel
+BuildRequires:  python2-mock
+BuildRequires:  python2-pytest
+BuildRequires:  python2-pytest-cov
+BuildRequires:  python2-setuptools
+BuildRequires:  python2-six
+Requires:       python2-six
+
+%description -n python2-%{pypi_name}
+pymemcache supports the following features:
+
+* Complete implementation of the memcached text protocol.
+* Configurable timeouts for socket connect and send/recv calls.
+* Access to the "noreply" flag, which can significantly increase the speed of
+  writes.
+* Flexible, simple approach to serialization and deserialization.
+* The (optional) ability to treat network and memcached errors as cache misses.
+%endif
+
+%if %{with python3}
 %package -n python3-%{pypi_name}
 Summary:        A comprehensive, fast, pure Python memcached client
 BuildRequires:  python3-devel
-BuildRequires:  python3-nose >= 1.0
+BuildRequires:  python3-mock
+BuildRequires:  python3-pytest
+BuildRequires:  python3-pytest-cov
 BuildRequires:  python3-setuptools
 BuildRequires:  python3-six
 Requires:       python3-six
@@ -58,33 +83,48 @@ rm -rf %{pypi_name}.egg-info
 
 
 %build
-
-%if 0%{?with_python3}
-%{__python3} setup.py build
+%if %{with python2}
+%py2_build
+%endif
+%if %{with python3}
+%py3_build
 %endif
-
 
 %install
-
-%if 0%{?with_python3}
-%{__python3} setup.py install --skip-build --root %{buildroot}
+%if 0%{with python2}
+%py2_install
+%endif
+%if 0%{with python3}
+%py3_install
 %endif
-
 
 %check
-%if 0%{?with_python3}
-%{__python3} setup.py nosetests
+%if 0%{with python2}
+py.test-2 ./pymemcache/test/
+%endif
+%if 0%{with python3}
+py.test-3 ./pymemcache/test/
 %endif
 
+%if %{with python2}
+%files -n python2-%{pypi_name}
+%doc README.rst LICENSE.txt
+%{python2_sitelib}/%{pypi_name}
+%{python2_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
+%endif
 
-%if 0%{?with_python3}
+%if %{with python3}
 %files -n python3-%{pypi_name}
-%doc README.md LICENSE.txt
+%doc README.rst LICENSE.txt
 %{python3_sitelib}/%{pypi_name}
 %{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
 %endif
 
 %changelog
+* Mon Feb 11 2019 Javier Peña <jpena@redhat.com> - 2.1.1-1
+- Updated to upstream 2.1.1
+- Re-introduced python2 subpackage for EL7
+
 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.5-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/sources b/sources
index 3a15146..8a64f0c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-56dcfa6dfa7205118b60531e5336ab8b  pymemcache-1.2.5.tar.gz
+SHA512 (pymemcache-2.1.1.tar.gz) = 4faa7d7a0290c11d468dfacf1e053b6be8c6f362a596c9c80be6547927a2db86a50f6e69ca70dfd2aa3ae9aa8b9838f737fe3df765f879986ba004a33f427132