diff --git a/swig.spec b/swig.spec
index dbe1d80..d21ec0c 100644
--- a/swig.spec
+++ b/swig.spec
@@ -4,9 +4,9 @@
 %if %{without testsuite}
 %global tcl 0
 %global lualang 0
+%global perllang 0
 %global phplang 0
 %global rubylang 0
-%global python2lang 0
 %global python3lang 0
 %global golang 0
 %global octave 0
@@ -17,6 +17,7 @@
 %{!?tcl:%global tcl 1}
 %{!?guile:%global guile 0}
 %{!?lualang:%global lualang 1}
+%{!?perllang:%global perllang 1}
 %{!?phplang:%global phplang 1}
 # Disable Ruby test failed with swig 4.0.0 on s390
 %ifarch s390x
@@ -24,7 +25,6 @@
 %else
 %{!?rubylang:%global rubylang 1}
 %endif
-%{!?python2lang:%global python2lang 1}
 %{!?python3lang:%global python3lang 1}
 
 %if 0%{?rhel}
@@ -53,7 +53,7 @@
 Summary: Connects C/C++/Objective C to some high-level programming languages
 Name:    swig
 Version: 4.0.1
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv3+ and BSD
 URL:     http://swig.sourceforge.net/
 Source0: http://downloads.sourceforge.net/project/swig/swig/swig-%{version}/swig-%{version}.tar.gz
@@ -79,9 +79,6 @@ Patch3: swig-4.0.1-Fix-crash-in-Python-backend-when-using-empty-docstrings.patch
 Patch4: swig-Upgrade-to-support-newer-NodeJS.patch
 
 BuildRequires: perl-interpreter, pcre-devel
-%if %{python2lang}
-BuildRequires: python2-devel
-%endif
 BuildRequires: python%{python3_pkgversion}-devel
 BuildRequires: autoconf, automake, gawk, dos2unix
 BuildRequires: gcc-c++
@@ -191,13 +188,9 @@ done
 # It causes that log had more then 600M.
 %configure \
   --without-ocaml \
-%if %{python2lang}
-  --with-python=%__python2\
-%else
-  --without-python \
-%endif
 %if %{python3lang}
   --with-python3=%__python3 \
+  --with-2to3=%{_bindir}/2to3 \
 %else
   --without-python3 \
 %endif
@@ -206,6 +199,9 @@ done
 %else
   --without-php \
 %endif
+%if ! %{perllang}
+  --without-perl5 \
+%endif
 %if ! %{tcl}
   --without-tcl \
 %endif
@@ -219,7 +215,7 @@ done
   --without-go \
 %endif
 %if %{octave}
-  --with-octave=/usr/bin/octave \
+  --with-octave=%{_bindir}/octave \
   --without-maximum-compile-warnings \
 %endif
 %if %{without build_ccache_swig}
@@ -348,6 +344,9 @@ install -pm 644 Tools/swig.gdb %{buildroot}%{_datadir}/%{name}/gdb
 %{_datadir}/%{name}/gdb
 
 %changelog
+* Fri Mar 06 2020 Jitka Plesnikova <jplesnik@redhat.com> - 4.0.1-9
+- Remove BR for Python 2 (bug#1807547)
+
 * Tue Feb 25 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 4.0.1-8
 - Add fix for newer NodeJS version