diff --git a/Changelog.old b/Changelog.old
index 9879eec..25edc0a 100644
--- a/Changelog.old
+++ b/Changelog.old
@@ -1,3 +1,8 @@
+* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.0-2
+- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
+
+* Wed Mar 23 2016 RDO <rdo-list@redhat.com> 2.2.0-0.1
+-  Rebuild for Mitaka 
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
diff --git a/python-openstackclient.spec b/python-openstackclient.spec
index 5c777c2..8078f49 100644
--- a/python-openstackclient.spec
+++ b/python-openstackclient.spec
@@ -1,12 +1,12 @@
 %{!?upstream_version: %global upstream_version %{version}%{?milestone}}
 Name:             python-openstackclient
-Version:          2.2.0
-Release:          2%{?dist}
+Version:          3.2.0
+Release:          1%{?dist}
 Summary:          OpenStack Command-line Client
 
 License:          ASL 2.0
 URL:              http://github.com/openstack/%{name}
-Source0:          http://pypi.python.org/packages/source/p/%{name}/%{name}-%{version}%{?milestone}.tar.gz
+Source0:          https://tarballs.openstack.org/%{name}/%{name}-%{upstream_version}.tar.gz
 
 BuildArch:        noarch
 
@@ -30,11 +30,22 @@ BuildRequires:    python-neutronclient
 BuildRequires:    python-mock
 BuildRequires:    python-requests-mock
 BuildRequires:    python-os-client-config
+# Required to compile translation files
+BuildRequires:    python-babel
+# Required for unit tests
+BuildRequires:    python-os-testr
+BuildRequires:    python2-osc-lib-tests
+BuildRequires:    python-coverage
+BuildRequires:    python-fixtures
+BuildRequires:    python-oslotest
+BuildRequires:    python-reno
+BuildRequires:    python-requestsexceptions
+BuildRequires:    python-openstacksdk
+BuildRequires:    python-osprofiler
 
 Requires:         python-pbr
 Requires:         python-babel
 Requires:         python-cliff
-Requires:         python-cliff-tablib
 Requires:         python-crypto
 Requires:         python-openstacksdk
 Requires:         python-oslo-config
@@ -50,6 +61,7 @@ Requires:         python-six >= 1.9.0
 Requires:         python-requests >= 2.5.2
 Requires:         python-stevedore
 Requires:         python-os-client-config
+Requires:         python-osc-lib
 
 %description
 python-openstackclient is a unified command-line client for the OpenStack APIs.
@@ -70,9 +82,8 @@ actual REST API client actions.
 
 This package contains auto-generated documentation.
 
-
 %prep
-%setup -q -n %{name}-%{upstream_version}
+%autosetup -n %{name}-%{upstream_version} -S git
 
 # We handle requirements ourselves, pkg_resources only bring pain
 rm -rf requirements.txt test-requirements.txt
@@ -80,6 +91,9 @@ rm -rf requirements.txt test-requirements.txt
 %build
 %{__python2} setup.py build
 
+# Generate i18n iles
+%{__python2} setup.py compile_catalog -d build/lib/openstackclient/locale
+
 %install
 %{__python2} setup.py install -O1 --skip-build --root %{buildroot}
 
@@ -92,7 +106,19 @@ install -p -D -m 644 man/openstack.1 %{buildroot}%{_mandir}/man1/openstack.1
 # Fix hidden-file-or-dir warnings
 rm -fr html/.doctrees html/.buildinfo
 
-%files
+# Install i18n .mo files (.po and .pot are not required)
+install -d -m 755 %{buildroot}%{_datadir}
+rm -f %{buildroot}%{python2_sitelib}/openstackclient/locale/*/LC_*/openstackclient*po
+rm -f %{buildroot}%{python2_sitelib}/openstackclient/locale/*pot
+mv %{buildroot}%{python2_sitelib}/openstackclient/locale %{buildroot}%{_datadir}/locale
+
+# Find language files
+%find_lang openstackclient --all-name
+
+%check
+%{__python2} setup.py test
+
+%files -f openstackclient.lang
 %license LICENSE
 %doc README.rst
 %{_bindir}/openstack
@@ -105,8 +131,6 @@ rm -fr html/.doctrees html/.buildinfo
 %doc html
 
 %changelog
-* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.0-2
-- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
+* Tue Sep 13 2016 Haikel Guemar <hguemar@fedoraproject.org> 3.2.0-1
+- Update to 3.2.0
 
-* Wed Mar 23 2016 RDO <rdo-list@redhat.com> 2.2.0-0.1
--  Rebuild for Mitaka