diff --git a/RBTools.spec b/RBTools.spec
index 404d502..d45e73b 100644
--- a/RBTools.spec
+++ b/RBTools.spec
@@ -2,7 +2,7 @@
 
 Name:           RBTools
 Version:        0.7.11
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Tools for use with ReviewBoard
 
 Group:          Applications/Internet
@@ -12,11 +12,20 @@ Source0:        http://downloads.review-board.org/releases/%{name}/0.6/%{name}-%
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
+
+%if 0%{?rhel} && 0%{?rhel} <= 7
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools
 Requires:       python-setuptools
 Requires:       python-simplejson
 Requires:       python-six
+%else
+BuildRequires:  python2-devel
+BuildRequires:  python2-setuptools
+Requires:       python2-setuptools
+Requires:       python2-simplejson
+Requires:       python2-six
+%endif
 Requires:       python2-tqdm
 
 ### Patches ###
@@ -55,6 +64,10 @@ rm -rf $RPM_BUILD_ROOT
 %{python2_sitelib}/RBTools*.egg-info/
 
 %changelog
+* Fri Jan 19 2018 Stephen Gallagher <sgallagh@redhat.com> - 0.7.11-2
+- Prepare for modules
+- Make specfile common to Fedora and EPEL
+
 * Fri Jan 19 2018 Stephen Gallagher <sgallagh@redhat.com> - 0.7.11-1
 - Update to 0.7.11
 - Fix sitelib macro for Fedora 28