diff --git a/.gitignore b/.gitignore
index b7f1f8d..ec06cc2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /Flask-OAuth-0.9.tar.gz
 /Flask-OAuth-0.12.tar.gz
+/Flask-OAuth-0.13.tar.gz
diff --git a/python-flask-oauth.spec b/python-flask-oauth.spec
index aa287e0..fd60846 100644
--- a/python-flask-oauth.spec
+++ b/python-flask-oauth.spec
@@ -1,43 +1,78 @@
-%global mod_name Flask-OAuth
+%global modname Flask-OAuth
+%global srcname flask-oauth
 
-Name:           python-flask-oauth
-Version:        0.12
-Release:        6%{?dist}
+Name:           python-%{srcname}
+Version:        0.13
+Release:        1%{?dist}
 Summary:        Adds OAuth support to Flask
 
-Group:          Development/Libraries
 License:        BSD
 URL:            http://github.com/mitsuhiko/flask-oauth
-Source0:        http://pypi.python.org/packages/source/F/%{mod_name}/%{mod_name}-%{version}.tar.gz
+Source0:        http://github.com/mitsuhiko/flask-oauth/archive/%{version}/%{modname}-%{version}.tar.gz
 
 BuildArch:      noarch
-BuildRequires:  python-devel
-BuildRequires:  python-oauth2
-BuildRequires:  python-setuptools
 
 %description
-Flask-OAuth is an extension to Flask that allows you 
-to interact with remove OAuth enabled applications.
+Flask-OAuth is an extension to Flask that allows you to interact with remove
+OAuth enabled applications.
 
-%prep
-%setup -q -n %{mod_name}-%{version}
+%package -n python2-%{srcname}
+Summary:        %{summary}
+BuildRequires:  python2-devel
+BuildRequires:  python2-setuptools
+BuildRequires:  python2-oauth2
+%{?python_provide:%python_provide python2-%{modname}}
+%{?python_provide:%python_provide python2-%{srcname}}
 
+%description -n python2-%{srcname}
+Flask-OAuth is an extension to Flask that allows you to interact with remove
+OAuth enabled applications.
 
-%build
-CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
+Python 2 version.
 
+%package -n python3-%{srcname}
+Summary:        %{summary}
+BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
+BuildRequires:  python3-oauth2
+%{?python_provide:%python_provide python3-%{modname}}
+%{?python_provide:%python_provide python3-%{srcname}}
 
-%install
-rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+%description -n python3-%{srcname}
+Flask-OAuth is an extension to Flask that allows you to interact with remove
+OAuth enabled applications.
+
+Python 3 version.
+
+%prep
+%autosetup -n %{srcname}-%{version}
+
+%build
+%py2_build
+%py3_build
 
+%install
+%py2_install
+%py3_install
  
-%files
-%doc README PKG-INFO
-%{python_sitelib}/*.egg-info/
-%{python_sitelib}/*.py*
+%files -n python2-%{srcname}
+%license LICENSE
+%doc README
+%{python2_sitelib}/Flask_OAuth*.egg-info/
+%{python2_sitelib}/flask_oauth.py*
+
+%files -n python3-%{srcname}
+%license LICENSE
+%doc README
+%{python3_sitelib}/Flask_OAuth*.egg-info/
+%{python3_sitelib}/flask_oauth.py
+%{python3_sitelib}/__pycache__/flask_oauth.*
 
 %changelog
+* Sun Feb 07 2016 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.13-1
+- Update to 0.13
+- Make compatible with new guidelines
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.12-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
diff --git a/sources b/sources
index baae8e6..e22cf09 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-eea1295eb191f3d3064c61df5a10cdc1  Flask-OAuth-0.12.tar.gz
+fda3f9d82a9d0384e9089849e665a32d  Flask-OAuth-0.13.tar.gz