diff --git a/libraqm.spec b/libraqm.spec
index ae17f68..d617028 100644
--- a/libraqm.spec
+++ b/libraqm.spec
@@ -1,6 +1,6 @@
 Name:				libraqm
 Version:			0.7.0
-Release:			2%{?dist}
+Release:			3%{?dist}
 License:			MIT
 Summary:			Complex Textlayout Library
 Summary(ar):		مكتبة رقم للنّصوص المركّبة
@@ -49,13 +49,14 @@ This package contains documentation files for raqm.
 
 %prep
 %setup -q -n raqm-%{version}
+sed s:python:%{__python3}:g -i tests/Makefile.in #Fixed in next release on upstream 
 %configure --enable-gtk-doc
 
 %build
 make %{?_smp_mflags}
 
 %check
-%if 0%{?el7} || 0%{?el8}
+%if 0%{?el7}
 export LC_ALL=en_US.UTF-8
 %else
 export LC_ALL=C.utf8
@@ -85,9 +86,11 @@ rm -f %{buildroot}%{_libdir}/*.{la,a}
 %{_datadir}/gtk-doc/html/raqm
 
 %changelog
-* Sun Sep 8 2019 Mosaab Alzoubi <moceap@hotmail.com> - 0.7.0-2
-- Use python3 instead of python in BRs
-- Use LC_ALL=en_US.UTF-8 in EPEL
+* Fri Jan 10 2020 Mosaab Alzoubi <moceap@hotmail.com> - 0.7.0-3
+- First build on EPEL8
+- Use one branch to build on Fedora and EPEL
+- Use python3 as BR
+- Use LC_ALL=en_US.UTF-8 in EPEL7
 
 * Sun Sep 8 2019 Mosaab Alzoubi <moceap@hotmail.com> - 0.7.0-1
 - Updated to 0.7.0