diff --git a/airrac.spec b/airrac.spec
index 0332526..728b023 100644
--- a/airrac.spec
+++ b/airrac.spec
@@ -3,7 +3,7 @@
 #
 Name:           airrac
 Version:        1.00.3
-Release:        3%{?dist}
+Release:        2%{?dist}
 
 Summary:        C++ Simulated Revenue Accounting (RAC) System Library
 
@@ -12,10 +12,18 @@ URL:            http://github.com/airsim/%{name}
 Source0:        %{url}/archive/%{name}-%{version}.tar.gz
 
 BuildRequires:  gcc-c++
+%if 0%{?fedora} || 0%{?rhel} > 7
 BuildRequires:  cmake
+%else
+BuildRequires:  cmake3
+%endif
 BuildRequires:  python3-devel
 BuildRequires:  boost-devel
+%if 0%{?fedora} || 0%{?rhel} > 7
 BuildRequires:  boost-python3-devel
+%else
+BuildRequires:  boost-python36-devel
+%endif
 BuildRequires:  soci-mysql-devel
 BuildRequires:  soci-sqlite3-devel
 BuildRequires:  readline-devel
@@ -39,7 +47,7 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       pkgconfig
 
 # The cmake files have Python version backed in them
-Requires:       (python(abi) = %{python3_version} if python3-devel)
+#Requires:       (python(abi) = %%{python3_version} if python3-devel)
 
 %description    devel
 This package contains the header files, shared libraries and
@@ -65,7 +73,13 @@ online (http://%{name}.org).
 
 
 %build
+%if 0%{?fedora} || 0%{?rhel} > 7
 %cmake .
+%else
+if [ -d /usr/lib64 ]; then LIBSUFFIX="64"; fi
+export LIBSUFFIX_4_CMAKE="-DLIB_SUFFIX=$LIBSUFFIX"
+cmake3 ${LIBSUFFIX_4_CMAKE} .
+%endif
 %make_build
 
 %install
@@ -80,7 +94,11 @@ rm -f %{mydocs}/html/installdox
 rm -f $RPM_BUILD_ROOT%{_docdir}/%{name}/{NEWS,README.md,AUTHORS}
 
 %check
+%if 0%{?fedora} || 0%{?rhel} > 7
 ctest
+%else
+ctest3
+%endif
 
 
 %files
@@ -106,74 +124,11 @@ ctest
 
 
 %changelog
-* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 1.00.3-3
-- Rebuilt for Python 3.8
+* Fri May 08 2020 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 1.00.3-2
+- Rebuild for SOCI 4.0.0
 
-* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.00.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jul 11 2019 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 1.00.3-1
-- CMake support files updated for Python 3.8
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.00.2-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Jan 24 2019 Jonathan Wakely <jwakely@redhat.com> - 1.00.2-3
-- Rebuilt for Boost 1.69
-
-* Thu Jan 17 2019 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 1.00.2-2
-- Fixed a typo in Python library directory
-
-* Tue Jan 15 2019 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 1.00.2-1
-- Upstream update
-
-* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.00.1-17
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Thu May 10 2018 Jonathan Wakely <jwakely@redhat.com> - 1.00.1-16
-- Add BuildRequires: boost-python2-devel to fix build with boost-1.66.0-7.fc29
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.00.1-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Mon Jan 22 2018 Jonathan Wakely <jwakely@redhat.com> - 1.00.1-14
-- Rebuilt for Boost 1.66
-
-* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.00.1-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.00.1-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Sun Jul 23 2017 Björn Esser <besser82@fedoraproject.org> - 1.00.1-11
-- Rebuilt for Boost 1.64
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.00.1-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Thu Jan 12 2017 Igor Gnatenko <ignatenko@redhat.com> - 1.00.1-9
-- Rebuild for readline 7.x
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.00.1-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Mon Jan 18 2016 Jonathan Wakely <jwakely@redhat.com> - 1.00.1-7
-- Rebuilt for Boost 1.60
-
-* Sun Aug 30 2015 Jonathan Wakely <jwakely@redhat.com> 1.00.1-6
-- Patched and rebuilt for Boost 1.59
-
-* Sat Aug 29 2015 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 1.00.1-5 
-- Mass rebuild
-
-* Wed Jul 29 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.00.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159
-
-* Wed Jul 22 2015 David Tardon <dtardon@redhat.com> - 1.00.1-3
-- rebuild for Boost 1.58
-
-* Tue Jun 16 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.00.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+* Mon Oct 28 2019 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 1.00.3-1
+- First build for EPEL 8
 
 * Sun Jun 07 2015 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 1.00.1-1
 - Removed the dependency on ZeroMQ (only AirInv is dependent on it, not StdAir)
@@ -254,3 +209,4 @@ ctest
 
 * Fri Aug 05 2011 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.1.0-1
 - First package
+