diff --git a/SOURCES/spacewalk-koan-2.8.6-5-el8-to-spacewalk-koan-2.8.6-6-el8.patch b/SOURCES/spacewalk-koan-2.8.6-5-el8-to-spacewalk-koan-2.8.6-6-el8.patch
new file mode 100644
index 0000000..75db5ba
--- /dev/null
+++ b/SOURCES/spacewalk-koan-2.8.6-5-el8-to-spacewalk-koan-2.8.6-6-el8.patch
@@ -0,0 +1,38 @@
+diff --git a/spacewalk-koan.spec b/spacewalk-koan.spec
+index 50466ac..b0286c6 100644
+--- a/spacewalk-koan.spec
++++ b/spacewalk-koan.spec
+@@ -12,13 +12,22 @@
+ Summary: Support package for spacewalk koan interaction
+ Name: spacewalk-koan
+ Version: 2.8.6
+-Release: 5%{?dist}
++Release: 6%{?dist}
+ License: GPLv2
+ Source0: https://github.com/spacewalkproject/spacewalk/archive/%{name}-%{version}.tar.gz
+ URL:            https://github.com/spacewalkproject/spacewalk
+ BuildArch:      noarch
+ Requires:       %{pythonX}-%{name} = %{version}-%{release}
+ Requires:       koan
++# dd, du
++Requires:       coreutils
++Requires:       cpio
++Requires:       e2fsprogs
++# gzip, zcat
++Requires:       gzip
++Requires:       tar
++# mount, umount
++Requires:       util-linux
+ Requires:       xz
+ Conflicts: rhn-kickstart
+ Conflicts: rhn-kickstart-common
+@@ -104,6 +113,9 @@ make -f Makefile.spacewalk-koan install PREFIX=$RPM_BUILD_ROOT ROOT=%{python3_si
+ %endif
+ 
+ %changelog
++* Tue May 21 2019 Michael Mraka <michael.mraka@redhat.com> 2.8.6-6
++- Resolves: #1703706 - require commands we use in merge-rd.sh
++
+ * Tue Mar 20 2018 Tomas Kasparek <tkasparek@redhat.com> 2.8.6-5
+ - don't build python2 subpackages on systems with default python3
+   (tkasparek@redhat.com)
diff --git a/SOURCES/spacewalk-koan-2.8.6-6-el8-to-spacewalk-koan-2.8.6-7-el8.patch b/SOURCES/spacewalk-koan-2.8.6-6-el8-to-spacewalk-koan-2.8.6-7-el8.patch
new file mode 100644
index 0000000..516696f
--- /dev/null
+++ b/SOURCES/spacewalk-koan-2.8.6-6-el8-to-spacewalk-koan-2.8.6-7-el8.patch
@@ -0,0 +1,32 @@
+diff --git a/spacewalk-koan.spec b/spacewalk-koan.spec
+index b0286c6..683be43 100644
+--- a/spacewalk-koan.spec
++++ b/spacewalk-koan.spec
+@@ -12,7 +12,7 @@
+ Summary: Support package for spacewalk koan interaction
+ Name: spacewalk-koan
+ Version: 2.8.6
+-Release: 6%{?dist}
++Release: 7%{?dist}
+ License: GPLv2
+ Source0: https://github.com/spacewalkproject/spacewalk/archive/%{name}-%{version}.tar.gz
+ URL:            https://github.com/spacewalkproject/spacewalk
+@@ -58,7 +58,7 @@ Summary: Support package for spacewalk koan interaction
+ %{?python_provide:%python_provide python3-%{name}}
+ BuildRequires:  python3
+ BuildRequires:  python3-rpm-macros
+-Requires:       python3
++%{?__python3:Requires: %{__python3}}
+ %description -n python3-%{name}
+ Python 3 specific files for %{name}.
+ %endif
+@@ -113,6 +113,9 @@ make -f Makefile.spacewalk-koan install PREFIX=$RPM_BUILD_ROOT ROOT=%{python3_si
+ %endif
+ 
+ %changelog
++* Mon May 27 2019 Michael Mraka <michael.mraka@redhat.com> 2.8.6-7
++- Require the Python interpreter directly instead of using the package name
++
+ * Tue May 21 2019 Michael Mraka <michael.mraka@redhat.com> 2.8.6-6
+ - Resolves: #1703706 - require commands we use in merge-rd.sh
+ 
diff --git a/SPECS/spacewalk-koan.spec b/SPECS/spacewalk-koan.spec
index 529831a..20b3e7f 100644
--- a/SPECS/spacewalk-koan.spec
+++ b/SPECS/spacewalk-koan.spec
@@ -12,17 +12,28 @@
 Summary: Support package for spacewalk koan interaction
 Name: spacewalk-koan
 Version: 2.8.6
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2
 Source0: https://github.com/spacewalkproject/spacewalk/archive/%{name}-%{version}.tar.gz
 Patch0: spacewalk-koan-2.8.6-1-to-spacewalk-koan-2.8.6-2-el8.patch
 Patch1: spacewalk-koan-2.8.6-2-el8-to-spacewalk-koan-2.8.6-3-el8.patch
 Patch2: spacewalk-koan-2.8.6-3-el8-to-spacewalk-koan-2.8.6-4-el8.patch
 Patch3: spacewalk-koan-2.8.6-4-el8-to-spacewalk-koan-2.8.6-5-el8.patch
+Patch4: spacewalk-koan-2.8.6-5-el8-to-spacewalk-koan-2.8.6-6-el8.patch
+Patch5: spacewalk-koan-2.8.6-6-el8-to-spacewalk-koan-2.8.6-7-el8.patch
 URL:            https://github.com/spacewalkproject/spacewalk
 BuildArch:      noarch
 Requires:       %{pythonX}-%{name} = %{version}-%{release}
 Requires:       koan
+# dd, du
+Requires:       coreutils
+Requires:       cpio
+Requires:       e2fsprogs
+# gzip, zcat
+Requires:       gzip
+Requires:       tar
+# mount, umount
+Requires:       util-linux
 Requires:       xz
 Conflicts: rhn-kickstart
 Conflicts: rhn-kickstart-common
@@ -64,6 +75,8 @@ Python 3 specific files for %{name}.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 make -f Makefile.spacewalk-koan all
@@ -112,9 +125,11 @@ make -f Makefile.spacewalk-koan install PREFIX=$RPM_BUILD_ROOT ROOT=%{python3_si
 %endif
 
 %changelog
-* Tue Sep 25 2018 Tomas Orsava <torsava@redhat.com> - 2.8.6-6
+* Mon May 27 2019 Michael Mraka <michael.mraka@redhat.com> 2.8.6-7
 - Require the Python interpreter directly instead of using the package name
-- Related: rhbz#1633713
+
+* Tue May 21 2019 Michael Mraka <michael.mraka@redhat.com> 2.8.6-6
+- Resolves: #1703706 - require commands we use in merge-rd.sh
 
 * Tue Mar 20 2018 Tomas Kasparek <tkasparek@redhat.com> 2.8.6-5
 - don't build python2 subpackages on systems with default python3