diff --git a/python-astroquery.spec b/python-astroquery.spec
index a51628f..116f004 100644
--- a/python-astroquery.spec
+++ b/python-astroquery.spec
@@ -3,7 +3,7 @@
 
 Name:           python-%{srcname}
 Version:        0.3.6
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        %{sum}
 
 License:        BSD
@@ -11,20 +11,20 @@ URL:            http://pypi.python.org/pypi/%{srcname}
 Source0:        https://files.pythonhosted.org/packages/source/a/%{srcname}/%{srcname}-%{version}.tar.gz
 
 BuildArch:      noarch
-BuildRequires:  python-astropy
+BuildRequires:  python2-astropy
 BuildRequires:  python3-astropy
-BuildRequires:  python-beautifulsoup4
+BuildRequires:  python2-beautifulsoup4
 BuildRequires:  python3-beautifulsoup4
 BuildRequires:  python2-devel
 BuildRequires:  python3-devel
-BuildRequires:  python-html5lib
+BuildRequires:  python2-html5lib
 BuildRequires:  python3-html5lib
-BuildRequires:  python-keyring
+BuildRequires:  python2-keyring
 BuildRequires:  python3-keyring
-BuildRequires:  python-requests
+BuildRequires:  python2-requests
 BuildRequires:  python3-requests
 # Doc generation not yet working with rawhide 
-#BuildRequires:  python-sphinx
+#BuildRequires:  python2-sphinx
 #BuildRequires:  python3-sphinx
 
 %description
@@ -34,11 +34,11 @@ to access online Astronomical data.
 %package -n python2-%{srcname}
 Summary:        %{sum}
 %{?python_provide:%python_provide python2-%{srcname}}
-Requires:       python-astropy
-Requires:       python-beautifulsoup4
-Requires:       python-html5lib
-Requires:       python-keyring
-Requires:       python-requests
+Requires:       python2-astropy
+Requires:       python2-beautifulsoup4
+Requires:       python2-html5lib
+Requires:       python2-keyring
+Requires:       python2-requests
 
 %description -n python2-%{srcname}
 Astroquery is an astropy affiliated package that contains a collection of tools
@@ -103,6 +103,10 @@ chmod 755 %{buildroot}%{python3_sitelib}/%{srcname}/alma/tests/data/downloadRequ
 #%%license licenses/LICENSE.rst
 
 %changelog
+* Mon Jan 15 2018 Iryna Shcherbina <ishcherb@redhat.com> - 0.3.6-3
+- Update Python 2 dependency declarations to new packaging standards
+  (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
+
 * Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild