diff --git a/mbs-no-mbsbuild.patch b/mbs-no-mbsbuild.patch
index c5d571f..b5a0f05 100644
--- a/mbs-no-mbsbuild.patch
+++ b/mbs-no-mbsbuild.patch
@@ -1,17 +1,3 @@
-diff --git a/mbs-no-tabulate.patch b/mbs-no-tabulate.patch
-index e69de29..78d5927 100644
---- a/mbs-no-tabulate.patch
-+++ b/mbs-no-tabulate.patch
-@@ -0,0 +1,9 @@
-+diff --git a/requirements.txt b/requirements.txt
-+index 81b8fa1..5281b57 100644
-+--- a/requirements.txt
-++++ b/requirements.txt
-+@@ -20,4 +20,3 @@ qpid-python
-+ six
-+ sqlalchemy
-+ futures # Python 2 only
-+-tabulate
 diff --git a/requirements.txt b/requirements.txt
 index 81b8fa1..5281b57 100644
 --- a/requirements.txt
diff --git a/module-build-service.spec b/module-build-service.spec
index a64962c..e4dd1c4 100644
--- a/module-build-service.spec
+++ b/module-build-service.spec
@@ -1,6 +1,6 @@
 Name:		module-build-service
 Version:	1.3.22
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	The Module Build Service for Modularity
 
 
@@ -8,7 +8,9 @@ Group:		Development/Tools
 License:	MIT
 URL:		https://pagure.io/fm-orchestrator
 Source0:	https://files.pythonhosted.org/packages/source/m/%{name}/%{name}-%{version}.tar.gz
-Patch0:		mbs-no-mbsbuild.patch
+%if 0%{?rhel} && 0%{?rhel} <= 7
+Patch0:     mbs-no-mbsbuild.patch
+%endif
 Patch1:     mbs-fix-reuse-all.patch
 
 %if 0%{?rhel} && 0%{?rhel} <= 7
@@ -46,6 +48,7 @@ BuildRequires:	python2-modulemd >= 1.1.0
 BuildRequires:	rpm-build
 BuildRequires:	python-qpid
 BuildRequires:	python-futures
+BuildRequires:	python-openidc-client
 
 %if 0%{?rhel} && 0%{?rhel} <= 7
 BuildRequires:	python-setuptools
@@ -59,6 +62,7 @@ BuildRequires:	python2-flask-sqlalchemy
 BuildRequires:	python2-flask-migrate
 BuildRequires:	python2-nose
 BuildRequires:	python2-mock
+BuildRequires:	python2-tabulate
 %endif
 
 BuildRequires:	systemd
@@ -89,6 +93,7 @@ Requires:	python2-modulemd >= 1.1.0
 Requires:	rpm-build
 Requires:	python-qpid
 Requires:	python-futures
+Requires:	python-openidc-client
 
 %if 0%{?rhel} && 0%{?rhel} <= 7
 Requires:	python-flask-sqlalchemy
@@ -98,6 +103,8 @@ Requires:	python-mock
 Requires:	python2-flask-sqlalchemy
 Requires:	python2-flask-migrate
 Requires:	python2-mock
+Requires:	python2-tabulate
+Requires:	python2-systemd
 %endif
 
 
@@ -118,7 +125,9 @@ for a number of tasks:
 
 %prep
 %setup -q
+%if 0%{?rhel} && 0%{?rhel} <= 7
 %patch0 -p1
+%endif
 %patch1 -p1
 
 # Simply remove an old .pyc file that was included in one release.
@@ -169,6 +178,9 @@ done
 
 
 %changelog
+* Thu May 25 2017 Jan Kaluza <jkaluza@redhat.com> - 1.3.22-3
+- Use the same spec file for both epel7 and fedora
+
 * Tue May 16 2017 Jan Kaluza <jkaluza@redhat.com> - 1.3.22-2
 - fix reusing all components