diff --git a/files/0001-Default-to-openjdk-11.patch b/files/0001-Default-to-openjdk-11.patch
--- a/files/0001-Default-to-openjdk-11.patch
+++ b/files/0001-Default-to-openjdk-11.patch
@@ -15,7 +15,7 @@
  fi
  
  if [ -z "$JAVA_HOME" ] ; then
--  JAVACMD=`which java`
+-  JAVACMD="`\\unset -f command; \\command -v java`"
 +  JAVACMD='/usr/lib64/openjdk-11/bin/java'
  else
    JAVACMD="$JAVA_HOME/bin/java"
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,8 +1,8 @@
 name       : apache-maven
-version    : 3.8.3
-release    : 14
+version    : 3.8.4
+release    : 15
 source     :
-    - https://github.com/apache/maven/archive/maven-3.8.3.tar.gz : 1af036a3b69d8e91e48236ae99a314db41868155196aaac475dbfefa11f55dbf
+    - https://github.com/apache/maven/archive/maven-3.8.4.tar.gz : 41031e3dfcb0d75d99a5615c988bab3d2d2819c98482eb5d17a877c758925c02
 license    : Apache-2.0
 component  : programming.java
 summary    : A software project management and comprehension tool
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -34,31 +34,31 @@
             <Path fileType="data">/usr/share/apache-maven/lib/commons-lang3-3.8.1.jar</Path>
             <Path fileType="data">/usr/share/apache-maven/lib/guava-25.1-android.jar</Path>
             <Path fileType="data">/usr/share/apache-maven/lib/guice-4.2.2-no_aop.jar</Path>
-            <Path fileType="data">/usr/share/apache-maven/lib/jansi-2.3.4.jar</Path>
+            <Path fileType="data">/usr/share/apache-maven/lib/jansi-2.4.0.jar</Path>
             <Path fileType="data">/usr/share/apache-maven/lib/jansi-native</Path>
             <Path fileType="data">/usr/share/apache-maven/lib/javax.annotation-api-1.2.jar</Path>
             <Path fileType="data">/usr/share/apache-maven/lib/javax.inject-1.jar</Path>
             <Path fileType="data">/usr/share/apache-maven/lib/jcl-over-slf4j-1.7.32.jar</Path>
-            <Path fileType="data">/usr/share/apache-maven/lib/maven-artifact-3.8.3.jar</Path>
-            <Path fileType="data">/usr/share/apache-maven/lib/maven-builder-support-3.8.3.jar</Path>
-            <Path fileType="data">/usr/share/apache-maven/lib/maven-compat-3.8.3.jar</Path>
-            <Path fileType="data">/usr/share/apache-maven/lib/maven-core-3.8.3.jar</Path>
-            <Path fileType="data">/usr/share/apache-maven/lib/maven-embedder-3.8.3.jar</Path>
-            <Path fileType="data">/usr/share/apache-maven/lib/maven-model-3.8.3.jar</Path>
-            <Path fileType="data">/usr/share/apache-maven/lib/maven-model-builder-3.8.3.jar</Path>
-            <Path fileType="data">/usr/share/apache-maven/lib/maven-plugin-api-3.8.3.jar</Path>
-            <Path fileType="data">/usr/share/apache-maven/lib/maven-repository-metadata-3.8.3.jar</Path>
+            <Path fileType="data">/usr/share/apache-maven/lib/maven-artifact-3.8.4.jar</Path>
+            <Path fileType="data">/usr/share/apache-maven/lib/maven-builder-support-3.8.4.jar</Path>
+            <Path fileType="data">/usr/share/apache-maven/lib/maven-compat-3.8.4.jar</Path>
+            <Path fileType="data">/usr/share/apache-maven/lib/maven-core-3.8.4.jar</Path>
+            <Path fileType="data">/usr/share/apache-maven/lib/maven-embedder-3.8.4.jar</Path>
+            <Path fileType="data">/usr/share/apache-maven/lib/maven-model-3.8.4.jar</Path>
+            <Path fileType="data">/usr/share/apache-maven/lib/maven-model-builder-3.8.4.jar</Path>
+            <Path fileType="data">/usr/share/apache-maven/lib/maven-plugin-api-3.8.4.jar</Path>
+            <Path fileType="data">/usr/share/apache-maven/lib/maven-repository-metadata-3.8.4.jar</Path>
             <Path fileType="data">/usr/share/apache-maven/lib/maven-resolver-api-1.6.3.jar</Path>
             <Path fileType="data">/usr/share/apache-maven/lib/maven-resolver-connector-basic-1.6.3.jar</Path>
             <Path fileType="data">/usr/share/apache-maven/lib/maven-resolver-impl-1.6.3.jar</Path>
-            <Path fileType="data">/usr/share/apache-maven/lib/maven-resolver-provider-3.8.3.jar</Path>
+            <Path fileType="data">/usr/share/apache-maven/lib/maven-resolver-provider-3.8.4.jar</Path>
             <Path fileType="data">/usr/share/apache-maven/lib/maven-resolver-spi-1.6.3.jar</Path>
             <Path fileType="data">/usr/share/apache-maven/lib/maven-resolver-transport-wagon-1.6.3.jar</Path>
             <Path fileType="data">/usr/share/apache-maven/lib/maven-resolver-util-1.6.3.jar</Path>
-            <Path fileType="data">/usr/share/apache-maven/lib/maven-settings-3.8.3.jar</Path>
-            <Path fileType="data">/usr/share/apache-maven/lib/maven-settings-builder-3.8.3.jar</Path>
+            <Path fileType="data">/usr/share/apache-maven/lib/maven-settings-3.8.4.jar</Path>
+            <Path fileType="data">/usr/share/apache-maven/lib/maven-settings-builder-3.8.4.jar</Path>
             <Path fileType="data">/usr/share/apache-maven/lib/maven-shared-utils-3.3.4.jar</Path>
-            <Path fileType="data">/usr/share/apache-maven/lib/maven-slf4j-provider-3.8.3.jar</Path>
+            <Path fileType="data">/usr/share/apache-maven/lib/maven-slf4j-provider-3.8.4.jar</Path>
             <Path fileType="data">/usr/share/apache-maven/lib/org.eclipse.sisu.inject-0.3.5.jar</Path>
             <Path fileType="data">/usr/share/apache-maven/lib/org.eclipse.sisu.plexus-0.3.5.jar</Path>
             <Path fileType="data">/usr/share/apache-maven/lib/plexus-cipher-2.0.jar</Path>
@@ -73,12 +73,12 @@
         </Files>
     </Package>
     <History>
-        <Update release="14">
-            <Date>2021-10-29</Date>
-            <Version>3.8.3</Version>
+        <Update release="15">
+            <Date>2022-01-14</Date>
+            <Version>3.8.4</Version>
             <Comment>Packaging update</Comment>
             <Name>Reilly Brogan</Name>
             <Email>solus@reillybrogan.com</Email>
         </Update>
     </History>
 </PISI>
\ No newline at end of file