diff --git a/.gitignore b/.gitignore
index fc85af6..a13c2e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,4 @@
 /pki-core-10.3.0.a1.tar.gz
 /pki-core-10.3.0.a2.tar.gz
 /pki-core-10.3.0.b1.tar.gz
+/pki-core-10.3.1.tar.gz
diff --git a/pki-core.spec b/pki-core.spec
index bce6bd2..fce6caf 100644
--- a/pki-core.spec
+++ b/pki-core.spec
@@ -42,7 +42,7 @@
 %define pki_homedir /usr/share/pki
 
 Name:             pki-core
-Version:          10.3.0.b1
+Version:          10.3.1
 Release:          1%{?dist}
 Summary:          Certificate System - PKI Core Components
 URL:              http://pki.fedoraproject.org/
@@ -106,9 +106,18 @@ BuildRequires:    resteasy >= 3.0.6-2
 
 %if ! 0%{?rhel}
 BuildRequires:    pylint
+%if 0%{?fedora} >= 24
+BuildRequires:    python-flake8 >= 2.5.4
+BuildRequires:    python3-flake8 >= 2.5.4
+# python-flake8 2.5.4 package should require pyflakes >= 1.2.3
+BuildRequires:    pyflakes >= 1.2.3
+# python3-flake8 2.5.4 package should require python3-pyflakes >= 1.2.3
+BuildRequires:    python3-pyflakes >= 1.2.3
+%else
 BuildRequires:    python-flake8
 BuildRequires:    python3-flake8
 %endif
+%endif
 
 BuildRequires:    python-nss
 BuildRequires:    python-requests
@@ -1007,6 +1016,7 @@ systemctl daemon-reload
 %{_sbindir}/pki-server
 %{_sbindir}/pki-server-nuxwdog
 %{_sbindir}/pki-server-upgrade
+%{_libexecdir}/pki-ipa-retrieve-key
 %{python2_sitelib}/pki/server/
 %dir %{_datadir}/pki/deployment
 %{_datadir}/pki/deployment/config/
@@ -1105,6 +1115,12 @@ systemctl daemon-reload
 %endif # %{with server}
 
 %changelog
+* Tue May 17 2016 Dogtag Team <pki-devel@redhat.com> 10.3.1-1
+- Updated version number to 10.3.1-1 (to allow upgrade from 10.3.0.b1)
+
+* Mon May 16 2016 Dogtag Team <pki-devel@redhat.com> 10.3.0-1
+- Updated version number to 10.3.0-1
+
 * Mon Apr 18 2016 Dogtag Team <pki-devel@redhat.com> 10.3.0.b1-1
 - Build for F24 beta
 
diff --git a/sources b/sources
index 6ace4ae..528cf6b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dc62aa2824bf118459ec54fcaa0ce8cc  pki-core-10.3.0.b1.tar.gz
+47a8587ddc754a4f54e6da6a2ee68eba  pki-core-10.3.1.tar.gz