diff --git a/.gitignore b/.gitignore
index b3fc5cf..688ee01 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /keystoneauth1-2.18.0.tar.gz
 /keystoneauth1-3.1.0.tar.gz
 /keystoneauth1-3.4.0.tar.gz
+/keystoneauth1-3.13.1.tar.gz
diff --git a/python-keystoneauth1.spec b/python-keystoneauth1.spec
index 097c436..d86b690 100644
--- a/python-keystoneauth1.spec
+++ b/python-keystoneauth1.spec
@@ -1,18 +1,19 @@
 %global pypi_name keystoneauth1
 
-%global with_tests 0
-
 %global common_desc \
 Keystoneauth provides a standard way to do authentication and service requests \
 within the OpenStack ecosystem. It is designed for use in conjunction with \
 the existing OpenStack clients and for simplifying the process of writing \
 new clients.
 
+
+%global with_doc 1
+
 %{!?upstream_version: %global upstream_version %{version}%{?milestone}}
 
 Name:       python-%{pypi_name}
-Version:    3.4.0
-Release:    5%{?dist}
+Version:    3.13.1
+Release:    1%{?dist}
 Summary:    Authentication Library for OpenStack Clients
 License:    ASL 2.0
 URL:        https://pypi.io/pypi/%{pypi_name}
@@ -26,24 +27,33 @@ BuildArch:  noarch
 %package -n     python3-%{pypi_name}
 Summary:        Authentication Libarary for OpenStack Identity
 Provides:       python3-keystoneauth = %{version}-%{release}
+%{?python_provide:%python_provide python3-%{pypi_name}}
 
 BuildRequires: python3-devel
 BuildRequires: python3-setuptools
 BuildRequires: python3-pbr >= 2.0.0
-BuildRequires: python3-sphinx
 
 # test requres
 BuildRequires: python3-betamax >= 0.7.0
 BuildRequires: python3-fixtures >= 1.3.1
 BuildRequires: python3-lxml
+BuildRequires: python3-mock
+BuildRequires: python3-requests-kerberos
 BuildRequires: python3-requests-mock >= 1.1
+BuildRequires: python3-oslo-config
 BuildRequires: python3-oslotest
 BuildRequires: python3-oslo-utils
-BuildRequires: python3-os-testr
+BuildRequires: python3-stestr
 BuildRequires: python3-oauthlib
+BuildRequires: python3-requests
 BuildRequires: python3-PyYAML
+BuildRequires: python3-pep8
+BuildRequires: python3-os-service-types
+BuildRequires: python3-stevedore
+BuildRequires: python3-iso8601
 
 Requires:      python3-iso8601 >= 0.1.11
+Requires:      python3-os-service-types
 Requires:      python3-pbr >= 2.0.0
 Requires:      python3-requests >= 2.14.2
 Requires:      python3-six => 1.10.0
@@ -52,6 +62,18 @@ Requires:      python3-stevedore >= 1.20.0
 %description -n python3-%{pypi_name}
 %{common_desc}
 
+%if 0%{?with_doc}
+%package doc
+Summary:    Documentation for OpenStack Identity Authentication Library
+
+BuildRequires: python3-sphinx
+BuildRequires: python3-openstackdocstheme
+
+%description doc
+Documentation for OpenStack Identity Authentication Library
+%endif
+
+
 %prep
 %autosetup -n %{pypi_name}-%{upstream_version} -S git
 
@@ -68,14 +90,15 @@ rm -rf %{pypi_name}.egg-info
 %install
 %py3_install
 
+%if 0%{?with_doc}
+# generate html docs
+%{__python3} setup.py build_sphinx -b html
+rm -rf doc/build/html/.buildinfo
+%endif
+
 %check
-# keystoneauth upstream switched to stestr
-#%{__python2} /usr/bin/ostestr
-#%if 0%{?with_python3}
-# cleanup testrepository
-#rm -rf .testrepository
-#%{__python3} /usr/bin/ostestr
-#%endif
+export PYTHON=python3
+stestr-3 run ||:
 
 %files -n python3-%{pypi_name}
 %doc README.rst
@@ -83,19 +106,13 @@ rm -rf %{pypi_name}.egg-info
 %{python3_sitelib}/%{pypi_name}
 %{python3_sitelib}/*.egg-info
 
-%changelog
-* Fri Feb 15 2019 Alfredo Moralejo <amoralej@redhat.com> - 3.4.0-5
-- Remove python2 subpackages.
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 3.4.0-2
-- Rebuilt for Python 3.7
+%if 0%{?with_doc}
+%files doc
+%license LICENSE
+%doc doc/build/html
+%endif
 
-* Sat Feb 10 2018 RDO <dev@lists.rdoproject.org> 3.4.0-1
-- Update to 3.4.0
+%changelog
+* Fri Mar 08 2019 RDO <dev@lists.rdoproject.org> 3.13.1-1
+- Update to 3.13.1
 
diff --git a/sources b/sources
index 4bba19a..f8fc00f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (keystoneauth1-3.4.0.tar.gz) = aeaefb0e5b369e36e06adc1bada104dab2c2aed22bf96cc3e20a5dd4ce8ae10869eb73ce4802faef70f191c3bbd38e3b5c3dff3606c46956fb350c0875cb7a7d
+SHA512 (keystoneauth1-3.13.1.tar.gz) = ee83652b67032cd04e88c8c4fcce708d113bccd17cb62843b4a03845ffcd40632a10613759946fbc684a80c2391e144dcf37aecb41eb151ebe83e08f9e08a536