diff --git a/files/0001-Default-to-openjdk-8.patch b/files/0001-Default-to-openjdk-11.patch
rename from files/0001-Default-to-openjdk-8.patch
rename to files/0001-Default-to-openjdk-11.patch
--- a/files/0001-Default-to-openjdk-8.patch
+++ b/files/0001-Default-to-openjdk-11.patch
@@ -16,7 +16,7 @@
  
  if [ -z "$JAVA_HOME" ] ; then
 -  JAVACMD=`which java`
-+  JAVACMD='/usr/lib64/openjdk-8/bin/java'
++  JAVACMD='/usr/lib64/openjdk-11/bin/java'
  else
    JAVACMD="$JAVA_HOME/bin/java"
  fi
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,8 +1,8 @@
 name       : apache-maven
-version    : 3.6.2
-release    : 11
+version    : 3.6.3
+release    : 12
 source     :
-    - https://github.com/apache/maven/archive/maven-3.6.2.tar.gz : 9dfab7ff5c9f49201631512f9a8c5148f50ba92776dd2b86b36077bd7eefbf2e
+    - https://github.com/apache/maven/archive/maven-3.6.3.tar.gz : 058647eb853d91da8882fdc383c3c27f687192215d260824f228b019f4a95ff3
 license    : Apache-2.0
 component  : programming.java
 summary    : A software project management and comprehension tool
@@ -12,13 +12,10 @@
 builddeps  :
     - apache-maven
 rundeps    :
-    - openjdk-8
+    - openjdk-11
 setup      : |
-    %patch -p1 < $pkgfiles/0001-Default-to-openjdk-8.patch
+    %patch -p1 < $pkgfiles/0001-Default-to-openjdk-11.patch
 build      : |
-    # Can be removed in release 12. This is just for bootstrapping
-    export JAVA_HOME=/usr/lib64/openjdk-8
-
     mvn -DdistributionTargetDir=$installdir/usr/share/apache-maven -Dmaven.repo.local=../local-repo clean install
 install    : |
     install -dm00755 $installdir/usr/bin
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,8 +2,8 @@
     <Source>
         <Name>apache-maven</Name>
         <Packager>
-            <Name>Fabio Forni</Name>
-            <Email>livingsilver94.solus@redaril.me</Email>
+            <Name>Campbell Jones</Name>
+            <Email>dev@serebit.com</Email>
         </Packager>
         <License>Apache-2.0</License>
         <PartOf>programming.java</PartOf>
@@ -38,48 +38,49 @@
             <Path fileType="data">/usr/share/apache-maven/lib/jansi-1.17.1.jar</Path>
             <Path fileType="data">/usr/share/apache-maven/lib/jansi-native/linux64/libjansi.so</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.25.jar</Path>
+            <Path fileType="data">/usr/share/apache-maven/lib/jcl-over-slf4j-1.7.29.jar</Path>
+            <Path fileType="data">/usr/share/apache-maven/lib/jsoup-1.12.1.jar</Path>
             <Path fileType="data">/usr/share/apache-maven/lib/jsr250-api-1.0.jar</Path>
-            <Path fileType="data">/usr/share/apache-maven/lib/maven-artifact-3.6.2.jar</Path>
-            <Path fileType="data">/usr/share/apache-maven/lib/maven-builder-support-3.6.2.jar</Path>
-            <Path fileType="data">/usr/share/apache-maven/lib/maven-compat-3.6.2.jar</Path>
-            <Path fileType="data">/usr/share/apache-maven/lib/maven-core-3.6.2.jar</Path>
-            <Path fileType="data">/usr/share/apache-maven/lib/maven-embedder-3.6.2.jar</Path>
-            <Path fileType="data">/usr/share/apache-maven/lib/maven-model-3.6.2.jar</Path>
-            <Path fileType="data">/usr/share/apache-maven/lib/maven-model-builder-3.6.2.jar</Path>
-            <Path fileType="data">/usr/share/apache-maven/lib/maven-plugin-api-3.6.2.jar</Path>
-            <Path fileType="data">/usr/share/apache-maven/lib/maven-repository-metadata-3.6.2.jar</Path>
+            <Path fileType="data">/usr/share/apache-maven/lib/maven-artifact-3.6.3.jar</Path>
+            <Path fileType="data">/usr/share/apache-maven/lib/maven-builder-support-3.6.3.jar</Path>
+            <Path fileType="data">/usr/share/apache-maven/lib/maven-compat-3.6.3.jar</Path>
+            <Path fileType="data">/usr/share/apache-maven/lib/maven-core-3.6.3.jar</Path>
+            <Path fileType="data">/usr/share/apache-maven/lib/maven-embedder-3.6.3.jar</Path>
+            <Path fileType="data">/usr/share/apache-maven/lib/maven-model-3.6.3.jar</Path>
+            <Path fileType="data">/usr/share/apache-maven/lib/maven-model-builder-3.6.3.jar</Path>
+            <Path fileType="data">/usr/share/apache-maven/lib/maven-plugin-api-3.6.3.jar</Path>
+            <Path fileType="data">/usr/share/apache-maven/lib/maven-repository-metadata-3.6.3.jar</Path>
             <Path fileType="data">/usr/share/apache-maven/lib/maven-resolver-api-1.4.1.jar</Path>
             <Path fileType="data">/usr/share/apache-maven/lib/maven-resolver-connector-basic-1.4.1.jar</Path>
             <Path fileType="data">/usr/share/apache-maven/lib/maven-resolver-impl-1.4.1.jar</Path>
-            <Path fileType="data">/usr/share/apache-maven/lib/maven-resolver-provider-3.6.2.jar</Path>
+            <Path fileType="data">/usr/share/apache-maven/lib/maven-resolver-provider-3.6.3.jar</Path>
             <Path fileType="data">/usr/share/apache-maven/lib/maven-resolver-spi-1.4.1.jar</Path>
             <Path fileType="data">/usr/share/apache-maven/lib/maven-resolver-transport-wagon-1.4.1.jar</Path>
             <Path fileType="data">/usr/share/apache-maven/lib/maven-resolver-util-1.4.1.jar</Path>
-            <Path fileType="data">/usr/share/apache-maven/lib/maven-settings-3.6.2.jar</Path>
-            <Path fileType="data">/usr/share/apache-maven/lib/maven-settings-builder-3.6.2.jar</Path>
+            <Path fileType="data">/usr/share/apache-maven/lib/maven-settings-3.6.3.jar</Path>
+            <Path fileType="data">/usr/share/apache-maven/lib/maven-settings-builder-3.6.3.jar</Path>
             <Path fileType="data">/usr/share/apache-maven/lib/maven-shared-utils-3.2.1.jar</Path>
-            <Path fileType="data">/usr/share/apache-maven/lib/maven-slf4j-provider-3.6.2.jar</Path>
-            <Path fileType="data">/usr/share/apache-maven/lib/org.eclipse.sisu.inject-0.3.3.jar</Path>
-            <Path fileType="data">/usr/share/apache-maven/lib/org.eclipse.sisu.plexus-0.3.3.jar</Path>
+            <Path fileType="data">/usr/share/apache-maven/lib/maven-slf4j-provider-3.6.3.jar</Path>
+            <Path fileType="data">/usr/share/apache-maven/lib/org.eclipse.sisu.inject-0.3.4.jar</Path>
+            <Path fileType="data">/usr/share/apache-maven/lib/org.eclipse.sisu.plexus-0.3.4.jar</Path>
             <Path fileType="data">/usr/share/apache-maven/lib/plexus-cipher-1.7.jar</Path>
-            <Path fileType="data">/usr/share/apache-maven/lib/plexus-component-annotations-2.0.0.jar</Path>
+            <Path fileType="data">/usr/share/apache-maven/lib/plexus-component-annotations-2.1.0.jar</Path>
             <Path fileType="data">/usr/share/apache-maven/lib/plexus-interpolation-1.25.jar</Path>
             <Path fileType="data">/usr/share/apache-maven/lib/plexus-sec-dispatcher-1.4.jar</Path>
             <Path fileType="data">/usr/share/apache-maven/lib/plexus-utils-3.2.1.jar</Path>
-            <Path fileType="data">/usr/share/apache-maven/lib/slf4j-api-1.7.25.jar</Path>
-            <Path fileType="data">/usr/share/apache-maven/lib/wagon-file-3.3.3.jar</Path>
-            <Path fileType="data">/usr/share/apache-maven/lib/wagon-http-3.3.3-shaded.jar</Path>
-            <Path fileType="data">/usr/share/apache-maven/lib/wagon-provider-api-3.3.3.jar</Path>
+            <Path fileType="data">/usr/share/apache-maven/lib/slf4j-api-1.7.29.jar</Path>
+            <Path fileType="data">/usr/share/apache-maven/lib/wagon-file-3.3.4.jar</Path>
+            <Path fileType="data">/usr/share/apache-maven/lib/wagon-http-3.3.4-shaded.jar</Path>
+            <Path fileType="data">/usr/share/apache-maven/lib/wagon-provider-api-3.3.4.jar</Path>
         </Files>
     </Package>
     <History>
-        <Update release="11">
-            <Date>2019-11-24</Date>
-            <Version>3.6.2</Version>
+        <Update release="12">
+            <Date>2020-06-05</Date>
+            <Version>3.6.3</Version>
             <Comment>Packaging update</Comment>
-            <Name>Fabio Forni</Name>
-            <Email>livingsilver94.solus@redaril.me</Email>
+            <Name>Campbell Jones</Name>
+            <Email>dev@serebit.com</Email>
         </Update>
     </History>
 </PISI>
\ No newline at end of file