diff --git a/python-oslo.config.changes b/python-oslo.config.changes
index a95e0c6..afcd748 100644
--- a/python-oslo.config.changes
+++ b/python-oslo.config.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Mar  3 07:46:37 UTC 2016 - tbechtold@suse.com
+
+- Switch to.spec from rpm-packaging upstream project
+
 -------------------------------------------------------------------
 Sun Feb 28 13:39:45 UTC 2016 - dmueller@suse.com
 
diff --git a/python-oslo.config.spec b/python-oslo.config.spec
index 0f724a3..6211263 100644
--- a/python-oslo.config.spec
+++ b/python-oslo.config.spec
@@ -16,85 +16,84 @@
 #
 
 
+%global sname oslo.config
+
 Name:           python-oslo.config
 Version:        3.9.0
 Release:        0
-Summary:        OpenStack configuration API
+Summary:        OpenStack common configuration library
 License:        Apache-2.0
-Group:          Development/Languages/Python
-Url:            https://launchpad.net/oslo.config/
-Source:         http://tarballs.openstack.org/oslo.config/oslo.config-%{version}.tar.gz
-Source99:       rpmlintrc
-BuildRequires:  fdupes
-BuildRequires:  openstack-suse-macros
-BuildRequires:  python-devel
-# Test requirements:
-BuildRequires:  git-core
+Group:          Development/Languages
+Url:            https://launchpad.net/%{sname}
+Source0:        https://pypi.python.org/packages/source/o/%{sname}/%{sname}-%{version}.tar.gz
+BuildRequires:  openstack-macros
 BuildRequires:  python-debtcollector >= 1.2.0
-BuildRequires:  python-fixtures >= 0.3.14
-BuildRequires:  python-mock >= 1.0
-BuildRequires:  python-netaddr
-BuildRequires:  python-oslo.i18n >= 1.3.0
-BuildRequires:  python-oslosphinx
-BuildRequires:  python-oslotest >= 1.2.0
-BuildRequires:  python-pbr
+BuildRequires:  python-devel
+BuildRequires:  python-discover
+BuildRequires:  python-fixtures >= 1.3.1
+BuildRequires:  python-mock >= 1.2
+BuildRequires:  python-oslo.i18n >= 2.1.0
+BuildRequires:  python-oslotest >= 1.10.0
+BuildRequires:  python-pbr >= 1.6
 BuildRequires:  python-python-subunit >= 0.0.18
-BuildRequires:  python-six
-BuildRequires:  python-stevedore
+BuildRequires:  python-setuptools
 BuildRequires:  python-testrepository >= 0.0.18
 BuildRequires:  python-testscenarios >= 0.4
-BuildRequires:  python-testtools >= 0.9.36
+BuildRequires:  python-testtools >= 1.4.0
 Requires:       python-debtcollector >= 1.2.0
 Requires:       python-netaddr >= 0.7.12
 Requires:       python-six >= 1.9.0
 Requires:       python-stevedore >= 1.5.0
-Provides:       python-oslo-config = 2013.2
-Obsoletes:      python-oslo-config < 2013.2
-Provides:       %{name}-test = %{version}
-Obsoletes:      %{name}-test <= %{version}
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 
 %description
-The Oslo configuration API supports parsing command line arguments and
-.ini style configuration files.
+The Oslo project intends to produce a python library containing
+infrastructure code shared by OpenStack projects. The APIs provided
+by the project should be high quality, stable, consistent and generally
+useful.
+
+The oslo-config library is a command line and configuration file
+parsing library from the Oslo project.
+
 
 %package doc
-Summary:        OpenStack configuration API - Documentation
-Group:          Documentation/HTML
-BuildRequires:  python-Sphinx
-Requires:       %{name} = %{version}
-Provides:       python-oslo-config-doc = 2013.2
-Obsoletes:      python-oslo-config-doc < 2013.2
+Summary:        Documentation for OpenStack common configuration library
+Group:          Development/Languages
+BuildRequires:  python-Sphinx >= 1.1.2
+BuildRequires:  python-netaddr >= 0.7.12
+BuildRequires:  python-oslosphinx >= 2.5.0
+BuildRequires:  python-stevedore >= 1.5.0
 
 %description doc
-This package contains documentation files for %{name}.
+Documentation for the oslo-config library.
 
 %prep
-%setup -q -n oslo.config-%{version}
+%setup -q -n %{sname}-%{version}
 
 %build
 %{__python2} setup.py build
-
 # disabling git call for last modification date from git repo
 sed '/^html_last_updated_fmt.*/,/.)/ s/^/#/' -i doc/source/conf.py
-# generate html docs
-python setup.py build_sphinx
+
+%{__python2} setup.py build_sphinx
 # remove the sphinx-build leftovers
 rm -rf doc/build/html/.{doctrees,buildinfo}
 
 %install
-%{__python2} setup.py install --skip-build --root %{buildroot}
+%{__python2} setup.py install --prefix=%{_prefix} --root=%{buildroot}
+
+%check
+%{__python2} setup.py testr
 
 %files
+%doc README.rst
 %license LICENSE
-%doc README.rst AUTHORS
 %{_bindir}/oslo-config-generator
 %{python2_sitelib}/oslo_config
 %{python2_sitelib}/*.egg-info
 
 %files doc
-%license LICENSE
 %doc doc/build/html
+%license LICENSE
 
 %changelog