diff --git a/00-plexus-languages-1.0.patch b/00-plexus-languages-1.0.patch
deleted file mode 100644
index e87dec4..0000000
--- a/00-plexus-languages-1.0.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java b/src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java
-index 8bc437b..326f9f9 100644
---- a/src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java
-+++ b/src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java
-@@ -50,7 +50,7 @@ import org.codehaus.plexus.languages.java.jpms.JavaModuleDescriptor;
- import org.codehaus.plexus.languages.java.jpms.LocationManager;
- import org.codehaus.plexus.languages.java.jpms.ResolvePathsRequest;
- import org.codehaus.plexus.languages.java.jpms.ResolvePathsResult;
--import org.codehaus.plexus.languages.java.jpms.ResolvePathsResult.ModuleNameSource;
-+import org.codehaus.plexus.languages.java.jpms.ModuleNameSource;
- 
- /**
-  * Compiles application sources
diff --git a/0001-plexus-languages-1.0.patch b/0001-plexus-languages-1.0.patch
new file mode 100644
index 0000000..e7ebcf4
--- /dev/null
+++ b/0001-plexus-languages-1.0.patch
@@ -0,0 +1,25 @@
+From fd5749e9b8d47cf350527c4831a4ee53cefc60aa Mon Sep 17 00:00:00 2001
+From: Mat Booth <mat.booth@redhat.com>
+Date: Mon, 20 Jul 2020 22:51:52 +0100
+Subject: [PATCH 1/2] plexus languages 1.0
+
+---
+ .../java/org/apache/maven/plugin/compiler/CompilerMojo.java     | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java b/src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java
+index 8bc437b..326f9f9 100644
+--- a/src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java
++++ b/src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java
+@@ -50,7 +50,7 @@ import org.codehaus.plexus.languages.java.jpms.JavaModuleDescriptor;
+ import org.codehaus.plexus.languages.java.jpms.LocationManager;
+ import org.codehaus.plexus.languages.java.jpms.ResolvePathsRequest;
+ import org.codehaus.plexus.languages.java.jpms.ResolvePathsResult;
+-import org.codehaus.plexus.languages.java.jpms.ResolvePathsResult.ModuleNameSource;
++import org.codehaus.plexus.languages.java.jpms.ModuleNameSource;
+ 
+ /**
+  * Compiles application sources
+-- 
+2.26.2
+
diff --git a/0002-MCOMPILER-359-Fix-for-NPE.patch b/0002-MCOMPILER-359-Fix-for-NPE.patch
new file mode 100644
index 0000000..db0443e
--- /dev/null
+++ b/0002-MCOMPILER-359-Fix-for-NPE.patch
@@ -0,0 +1,25 @@
+From 8ef296b291e7ef1e1e4ab4fa4b520a80bde48a9f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=B6rg=20Hohwiller?= <hohwille@users.noreply.github.com>
+Date: Tue, 17 Dec 2019 19:05:57 +0100
+Subject: [PATCH 2/2] MCOMPILER-359: Fix for NPE
+
+---
+ .../java/org/apache/maven/plugin/compiler/TestCompilerMojo.java | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java b/src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java
+index f8b9ba1..203dd07 100644
+--- a/src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java
++++ b/src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java
+@@ -250,7 +250,7 @@ public class TestCompilerMojo
+                 
+                 for ( Entry<String, Exception> pathException : result.getPathExceptions().entrySet() )
+                 {
+-                    Throwable cause = pathException.getValue().getCause();
++                    Throwable cause = pathException.getValue();
+                     while ( cause.getCause() != null )
+                     {
+                         cause = cause.getCause();
+-- 
+2.26.2
+
diff --git a/maven-compiler-plugin.spec b/maven-compiler-plugin.spec
index 3466bbf..f4c7afa 100644
--- a/maven-compiler-plugin.spec
+++ b/maven-compiler-plugin.spec
@@ -1,6 +1,6 @@
 Name:           maven-compiler-plugin
 Version:        3.8.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Maven Compiler Plugin
 License:        ASL 2.0
 URL:            http://maven.apache.org/plugins/maven-compiler-plugin
@@ -9,7 +9,10 @@ BuildArch:      noarch
 Source0:        http://archive.apache.org/dist/maven/plugins/%{name}-%{version}-source-release.zip
 
 # port to plexus-languages 1.0.3
-Patch0:         00-plexus-languages-1.0.patch
+Patch0:         0001-plexus-languages-1.0.patch
+
+# Taken from upstream commit: https://github.com/apache/maven-compiler-plugin/commit/116b98153ef5ce7b13c0275324baa28bca8bc887
+Patch1:         0002-MCOMPILER-359-Fix-for-NPE.patch
 
 BuildRequires:  maven-local
 BuildRequires:  mvn(org.apache.maven:maven-artifact)
@@ -39,6 +42,7 @@ API documentation for %{name}.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %mvn_build -f
@@ -53,6 +57,9 @@ API documentation for %{name}.
 %license LICENSE NOTICE
 
 %changelog
+* Mon Jul 20 2020 Mat Booth <mat.booth@redhat.com> - 3.8.1-6
+- Add patch for NPE during testCompile
+
 * Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 3.8.1-5
 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11