diff --git a/SPECS/numpy.spec b/SPECS/numpy.spec
index 55cb574..38902d3 100644
--- a/SPECS/numpy.spec
+++ b/SPECS/numpy.spec
@@ -8,7 +8,7 @@
 
 Name:           numpy
 Version:        1.17.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A fast multidimensional array facility for Python
 
 # Everything is BSD except for class SafeEval in numpy/lib/utils.py which is Python
@@ -79,6 +79,11 @@ Requires:       python%{python3_pkgversion}-devel
 Provides:       python%{python3_pkgversion}-f2py = %{version}-%{release}
 %{?python_provide:%python_provide python%{python3_pkgversion}-numpy-f2py}
 
+# python38 installs the alternatives master symlink to which we attach a slave
+Requires: python38
+Requires(post): python38
+Requires(postun): python38
+
 %description -n python%{python3_pkgversion}-numpy-f2py
 This package includes a version of f2py that works properly with NumPy.
 
@@ -149,6 +154,10 @@ rm f2py
 rm f2py3
 popd &> /dev/null
 
+# All ghost files controlled by alternatives need to exist for the files
+# section check to succeed
+touch %{buildroot}%{_bindir}/f2py3
+
 
 %check
 %if %{with tests}
@@ -158,6 +167,20 @@ popd &> /dev/null
 %endif
 
 
+%post -n python%{python3_pkgversion}-numpy-f2py
+alternatives --add-slave python3 %{_bindir}/python3.8 \
+    %{_bindir}/f2py3 \
+    f2py3 \
+    %{_bindir}/f2py3.8
+
+%postun -n python%{python3_pkgversion}-numpy-f2py
+# Do this only during uninstall process (not during update)
+if [ $1 -eq 0 ]; then
+    alternatives --remove-slave python3 %{_bindir}/python3.8 \
+        f2py3
+fi
+
+
 %files -n python%{python3_pkgversion}-numpy
 %license LICENSE.txt
 %doc THANKS.txt site.cfg.example
@@ -182,6 +205,7 @@ popd &> /dev/null
 
 %files -n python%{python3_pkgversion}-numpy-f2py
 %{_bindir}/f2py%{python3_version}
+%ghost %{_bindir}/f2py3
 %{python3_sitearch}/%{name}/f2py
 
 %files -n python%{python3_pkgversion}-numpy-doc
@@ -189,6 +213,10 @@ popd &> /dev/null
 
 
 %changelog
+* Mon Mar 09 2020 Tomas Orsava <torsava@redhat.com> - 1.17.3-5
+- Implement the alternatives system for the executables
+- Resolves: rhbz#1807041
+
 * Thu Dec 12 2019 Tomas Orsava <torsava@redhat.com> - 1.17.3-4
 - Exclude unsupported i686 arch