diff --git a/subversion-1.12.0-swig-4.patch b/subversion-1.12.0-swig-4.patch
new file mode 100644
index 0000000..4094c2f
--- /dev/null
+++ b/subversion-1.12.0-swig-4.patch
@@ -0,0 +1,23 @@
+Fix build with Swig 4
+
+Two changes in python swig build options:
+* Remove -classic (not supported anymore, was for python 2.2).
+* Add -nofastunpack as default is set to fastunpack now/.
+
+See also https://issues.apache.org/jira/browse/SVN-4818.
+---
+ build.conf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/build.conf b/build.conf
+--- a/build.conf
++++ b/build.conf
+@@ -101,7 +101,7 @@ test-scripts =
+ 
+ bdb-test-scripts =
+ 
+-swig-python-opts = $(SWIG_FEATURES) -python $(SWIG_PY_FEATURES) -classic
++swig-python-opts = $(SWIG_FEATURES) -python $(SWIG_PY_FEATURES) -nofastunpack
+ swig-perl-opts = $(SWIG_FEATURES) -perl $(SWIG_PL_FEATURES) -nopm -noproxy
+ swig-ruby-opts = $(SWIG_FEATURES) -ruby $(SWIG_RB_FEATURES)
+ swig-languages = python perl ruby
diff --git a/subversion.changes b/subversion.changes
index 6487c88..30675e1 100644
--- a/subversion.changes
+++ b/subversion.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Jul 21 07:15:02 UTC 2019 - Antoine Belvire <antoine.belvire@opensuse.org>
+
+- Add subversion-1.12.0-swig-4.patch: Fix build with Swig 4
+  (boo#1135747).
+
 -------------------------------------------------------------------
 Sat May 18 01:45:06 UTC 2019 - Andreas Stieger <andreas.stieger@gmx.de>
 
diff --git a/subversion.spec b/subversion.spec
index b41dc1b..a12aed4 100644
--- a/subversion.spec
+++ b/subversion.spec
@@ -63,6 +63,8 @@ Patch30:        subversion-1.8.0-rpath.patch
 Patch37:        subversion-no-build-date.patch
 Patch39:        subversion-fix-parallel-build-support-for-perl-bindings.patch
 Patch40:        subversion-perl-underlinking.patch
+# PATCH-FIX-UPSTREAM subversion-1.12.0-swig-4.patch -- Support Swig 4
+Patch41:        subversion-1.12.0-swig-4.patch
 BuildRequires:  apache-rpm-macros
 BuildRequires:  apache2-devel >= 2.2.0
 BuildRequires:  apache2-prefork
@@ -250,6 +252,7 @@ parameters and keywords for the svn command and other tools.
 %patch37 -p1
 %patch39
 %patch40 -p1
+%patch41 -p1
 
 %build
 # Re-boot strap, needed for patch37