diff --git a/sources b/sources
index e081b90..4ebc919 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,5 @@
 SHA512 (0.3.0.tar.gz) = 8a061581256e1516aa6af156f0054462e1e81db04e2f51d28f64794c5e08f97a0fd6e5e4f277b33092309693346a56ce3602d56fd6131766e977cd9b331ef98f
 SHA512 (3.0.1.zip) = 62bc6d00eb768d310c776c1219f12c39e779a6d01a083ddbe5b784e626efd368a01478d564b5d150197ce4e227fb46cdf41aeaea06e2ade7a8a1b7cf5fda3ef2
-SHA512 (cmake-3.19.3.tar.gz) = 54c91fa76882152d3933b696d7e547bc4edf6f97f3810e8dd57ca28c98e9fcaf757eac7c77e1e7fab88aced10937ed354917aeac3997edef406313dcf76ba0c5
 SHA512 (cmark.tar.gz) = e76592081cc11048717e8fcb48772605a4d1d9ebdc81b967a8085721516e2414328818a6b5c0078c6b20e8a79b77d6dd749d5cd3017626603417818e85186d12
 SHA512 (corelibs-foundation.tar.gz) = 90c9a76418cd5ac111b3a23885c34aed19f35ede94d048625843bf46004f0f6368cc29827ea5555010f5dbf3f97ee59f2a3a21fbb3353f81c06f4809dd65f689
 SHA512 (corelibs-libdispatch.tar.gz) = a6ce5381d3776db5884ed691e2c22c0563da69cd3925c10f9de089a7f0e33dcbaec9d3afea4d58fa5cae819d104f9db7e81241b31ccc1bf8218d7923b2811a62
diff --git a/swift-lang.spec b/swift-lang.spec
index 409165d..7a37274 100644
--- a/swift-lang.spec
+++ b/swift-lang.spec
@@ -1,7 +1,6 @@
 %global debug_package %{nil}
 %global swifttag 5.4.1-RELEASE
 %global swiftbuild swift-source
-%global cmake_version 3.19.3
 %global icu_version 68-2
 %global yams_version 3.0.1
 %global sap_version 0.3.0
@@ -9,7 +8,7 @@
 
 Name:           swift-lang
 Version:        5.4.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Apple's Swift programming language
 License:        ASL 2.0 and Unicode
 URL:            https://swift.org
@@ -32,7 +31,6 @@ Source14:       https://github.com/apple/swift-driver/archive/swift-%{swifttag}.
 Source15:       https://github.com/unicode-org/icu/archive/release-%{icu_version}.tar.gz
 Source16:       https://github.com/apple/swift-syntax/archive/swift-%{swifttag}.zip#/swift-syntax.tar.gz
 Source17:       https://github.com/jpsim/Yams/archive/%{yams_version}.zip
-Source18:       https://github.com/Kitware/CMake/releases/download/v%{cmake_version}/cmake-%{cmake_version}.tar.gz
 
 Patch0:         swift-for-fedora.patch
 Patch1:         compiler-rt-fuzzer.patch
@@ -65,13 +63,12 @@ BuildRequires:  /usr/bin/pathfix.py
 BuildRequires:  make
 BuildRequires:  openssl-devel
 BuildRequires:  cmake
+%if 0%{!?el8}
+BuildRequires:  python-unversioned-command
+%endif
 
 Requires:       glibc-devel
-%if 0%{?fedora} >= 31
 Requires:       binutils-gold
-%else
-Requires:       binutils
-%endif
 Requires:       gcc
 Requires:       ncurses-devel
 Requires:       ncurses-compat-libs
@@ -80,7 +77,6 @@ Provides:       %{name} = %{version}-%{release}
 Obsoletes:      %{name} < %{version}-%{release}
 Obsoletes:      %{name}-runtime < %{version}-%{release}
 
-
 ExclusiveArch:  x86_64 aarch64 
 
 
@@ -97,16 +93,6 @@ correct programs easier for the developer.
 
 
 %prep
-%if 0%{?el8}
-# Now we build our own CMake because the one in EPEL8 is too old and
-# we can safely build it for all platforms (though will add some time
-# to the whole build process)
-%setup -q -c -n cmake -a 18
-mkdir cmake-build
-cd cmake-build
-../cmake-%{cmake_version}/bootstrap && make
-%endif
-
 %setup -q -c -n %{swiftbuild} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 
 # The Swift build script requires directories to be named
 # in a specific way so renaming the source directories is
@@ -164,14 +150,12 @@ pathfix.py -pni "%{__python3} %{py3_shbang_opts}" llvm-project/compiler-rt/lib/h
 
 %build
 export VERBOSE=1
-# We may not have /usr/bin/python, so we roll our own
-# because the build script expects there to be one.
+# Before Fedora 34, we may not have /usr/bin/python, so we
+# roll our own because the build script expects there to be one.
+%if 0%{?fedora} < 34 || 0%{?el8}
 mkdir $PWD/binforpython
 ln -s /usr/bin/python3 $PWD/binforpython/python
 export PATH=$PWD/binforpython:$PATH
-%if 0%{?el8}
-# And for CMake, which we built first
-export PATH=$PWD/../cmake/cmake-build/bin:$PATH
 %endif
 
 # Here we go!
@@ -207,6 +191,8 @@ export QA_SKIP_RPATHS=1
 
 
 %changelog
+* Mon Jun 21 2021 Ron Olson <tachoknight@gmail.com> - 5.4.1-2
+- Changes for EPEL-8
 * Thu Jun 10 2021 Ron Olson <tachoknight@gmail.com> - 5.4.1-1
 - Added fix for RPATH problems
 * Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 5.4-2
@@ -217,8 +203,6 @@ export QA_SKIP_RPATHS=1
 - Added patches to fix circular dependency on PkgConfig
 * Thu May 27 2021 Ron Olson <tachoknight@gmail.com> 5.4.1-1
 - Updated to swift-5.4.1-RELEASE
-* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 5.4-2
-- Rebuilt for Python 3.10
 * Tue Apr 27 2021 Ron Olson <tachoknight@gmail.com> 5.4-1
 - Updated to swift-5.4-RELEASE
 * Tue Apr 06 2021 Ron Olson <tachoknight@gmail.com> 5.4-1