diff --git a/eclipse-patch-out-fileupload-dep.patch b/eclipse-patch-out-fileupload-dep.patch
new file mode 100644
index 0000000..c75b00f
--- /dev/null
+++ b/eclipse-patch-out-fileupload-dep.patch
@@ -0,0 +1,26 @@
+--- rt.equinox.bundles/bundles/org.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF.orig	2019-05-30 16:37:50.444183989 +0100
++++ rt.equinox.bundles/bundles/org.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF	2019-05-30 16:39:53.635849673 +0100
+@@ -12,10 +12,7 @@
+  org.eclipse.equinox.http.servlet.context;version="1.0.0";x-internal:=true,
+  org.eclipse.equinox.http.servlet.session;version="1.0.0";x-internal:=true,
+  org.eclipse.equinox.http.servlet.dto;version="1.0.0";x-internal:=true
+-Import-Package: org.apache.commons.fileupload;version="[1.2.2, 2.0.0)";resolution:=optional,
+- org.apache.commons.fileupload.disk;version="[1.2.2, 2.0.0)";resolution:=optional,
+- org.apache.commons.fileupload.servlet;version="[1.2.2, 2.0.0)";resolution:=optional,
+- javax.servlet;version="[3.1.0,5.0.0)",
++Import-Package: javax.servlet;version="[3.1.0,5.0.0)",
+  javax.servlet.annotation;version="[3.1.0,5.0.0)";resolution:=optional,
+  javax.servlet.descriptor;version="[3.1.0,5.0.0)";resolution:=optional,
+  javax.servlet.http;version="[3.1.0,5.0.0)",
+--- rt.equinox.bundles/bundles/org.eclipse.equinox.http.servlet.tests/META-INF/MANIFEST.MF.orig	2019-05-30 16:55:25.117321897 +0100
++++ rt.equinox.bundles/bundles/org.eclipse.equinox.http.servlet.tests/META-INF/MANIFEST.MF	2019-05-30 16:55:36.792290214 +0100
+@@ -8,9 +8,6 @@
+ Require-Bundle: org.junit;bundle-version="4.0"
+ Import-Package: javax.servlet;version="2.6.0",
+  javax.servlet.http;version="2.6.0",
+- org.apache.commons.fileupload;version="1.2.2",
+- org.apache.commons.fileupload.disk;version="1.2.2",
+- org.apache.commons.fileupload.servlet;version="1.2.2",
+  org.eclipse.equinox.http.jetty;version="1.4.0",
+  org.eclipse.equinox.http.servlet;version="1.1.0",
+  org.eclipse.equinox.http.servlet.context;version="1.0.0",
diff --git a/eclipse.spec b/eclipse.spec
index 28f7750..d49de70 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -41,7 +41,7 @@ Epoch:                  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        4.11
-Release:        11%{?dist}
+Release:        12%{?dist}
 License:        EPL-2.0
 URL:            http://www.eclipse.org/
 
@@ -115,6 +115,9 @@ Patch23: eclipse-hide-droplets-from-install-wizard.patch
 # Avoid the need for a javascript interpreter at build time
 Patch24: eclipse-swt-avoid-javascript-at-build.patch
 
+# Avoid optional dep used only for tests
+Patch25: eclipse-patch-out-fileupload-dep.patch
+
 # Upstream no longer supports non-64bit arches
 ExcludeArch: s390 %{arm} %{ix86}
 
@@ -155,7 +158,6 @@ BuildRequires: apache-commons-el >= 1.0-22
 BuildRequires: apache-commons-logging
 BuildRequires: apache-commons-codec
 BuildRequires: apache-commons-jxpath
-BuildRequires: apache-commons-fileupload
 BuildRequires: osgi(org.apache.felix.gogo.shell) >= 1.1.0
 BuildRequires: osgi(org.apache.felix.gogo.command) >= 1.0.2
 BuildRequires: osgi(org.apache.felix.gogo.runtime) >= 1.1.0
@@ -400,6 +402,11 @@ rm -rf rt.equinox.binaries/org.eclipse.equinox.executable/{bin,contributed}/
 %patch22
 %patch23 -p1
 %patch24
+%patch25
+
+# Optional (unused) multipart support (see patch 25)
+rm rt.equinox.bundles/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/multipart/MultipartSupport{Impl,FactoryImpl,Part}.java
+rm rt.equinox.bundles/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/ServletTest.java
 
 # Remove python-based test
 rm eclipse.platform.swt/tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/gtk/accessibility/Bug543949_ComponentExtentsTest.py
@@ -1084,6 +1091,9 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist}
 %{_eclipsedir}/plugins/org.eclipse.osgi.util_*
 
 %changelog
+* Thu May 30 2019 Mat Booth <mat.booth@redhat.com> - 1:4.11-12
+- Avoid requirement on optional test dependency commons-fileupload
+
 * Fri May 24 2019 Mat Booth <mat.booth@redhat.com> - 1:4.11-11
 - Clean up unused maven metadata