diff --git a/MAINTAINERS.md b/MAINTAINERS.md
new file mode 100644
--- /dev/null
+++ b/MAINTAINERS.md
@@ -0,0 +1,5 @@
+This file is used to indicate responsibility for the maintenance of this package. Individuals on this list should be the sole modifiers of the package, excluding cases where the Solus Team may need to perform necessary rebuilds, upgrades, or security fixes. This list should not be used for any direct contact usage. If you believe this package requires a package update, follow documentation from https://getsol.us/articles/packaging/request-a-package-update/en/. In the event this package no longer becomes sufficiently maintained, Core Team reserves the right to request a new maintainer or remove this package from the repository.
+	
+- Campbell Jones
+  - IRC: serebit
+  - Email: dev@serebit.com
diff --git a/files/java-shim.txt b/files/java-shim.txt
new file mode 100644
--- /dev/null
+++ b/files/java-shim.txt
@@ -0,0 +1,4 @@
+if [ -z "$JAVA_HOME" ]; then
+    export JAVA_HOME=/usr/lib64/openjdk-11
+fi
+
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,34 +1,40 @@
 name       : kotlin
-version    : 1.2.31
-release    : 1
-source: 
-    - https://github.com/JetBrains/kotlin/archive/v1.2.31.tar.gz : 5b0ffdbb84c32fc22cc8e01fa029118edae6196f0c3b77bf459fb81de4cea1d2
+version    : 1.4.31
+release    : 2
+source     :
+    - https://github.com/JetBrains/kotlin/archive/v1.4.31.tar.gz : 06cb4561a58186a452a7413595937c81dcb031ca78fcd2c1a5f1e3b0a0b80fcc
 license    : Apache-2.0
 component  : programming
-summary    : Multiplatform programming language
+homepage   : https://kotlinlang.org/
+summary    : Statically typed multiplatform programming language
 description: |
-    Kotlin is a statically-typed programming language by JetBrains that runs on the Java virtual machine and also can be transpiled to JavaScript or compiled to native binaries via LLVM.
-builddeps  : 
-    - openjdk-8
-    - apache-ant
-rundeps    : 
+    Kotlin is a modern, concise, and safe programming language by JetBrains. It can run on the Java virtual machine, can be transpiled to JavaScript, and can be compiled to native binaries via LLVM. This package contains the JVM and JS compilers.
+builddeps  :
     - openjdk-8
+    - openjdk-11
+rundeps    :
+    - openjdk-11
 networking : yes
-setup      : |
-    echo "
-    JAVA_HOME=/usr/lib64/openjdk-8
-    JDK_16=/usr/lib64/openjdk-8
-    JDK_17=/usr/lib64/openjdk-8
-    JDK_18=/usr/lib64/openjdk-8
-    " >> gradle.properties
-    ant -f update_dependencies.xml
-build: |
-    export GRADLE_USER_HOME=$HOME
-    ./gradlew dist
-install: |
-    mkdir -p $installdir/usr/share/kotlin/bin $installdir/usr/share/kotlin/lib
-    find dist/kotlinc/bin -not -name "*.bat" -exec install -Dm777 {} $installdir/usr/share/kotlin/bin \;
-    install -D -m 00777 dist/kotlinc/lib/* $installdir/usr/share/kotlin/lib
-    echo %version% > $installdir/usr/share/kotlin/build.txt
-    mkdir $installdir/usr/bin
-    find $installdir/usr/share/kotlin/bin -type f -not -name "*.bat" -exec sh -c 'ln -sf /usr/share/kotlin/bin/$(basename {}) $installdir/usr/bin/' \;
+build      : |
+    export GRADLE_USER_HOME=$workdir/.gradle_home
+    export JAVA_HOME="/usr/lib64/openjdk-11"
+    export JDK_16="/usr/lib64/openjdk-8"
+    export JDK_17="/usr/lib64/openjdk-8"
+    export JDK_18="/usr/lib64/openjdk-8"
+    export JDK_9="/usr/lib64/openjdk-11"
+
+    ./gradlew dist -PdeployVersion="%version%"
+install    : |
+    install -dm 00644 $installdir/usr/share/kotlin/lib
+    install -Dm 00644 $workdir/dist/kotlinc/lib/* $installdir/usr/share/kotlin/lib
+
+    rm $workdir/dist/kotlinc/bin/*.bat
+
+    install -dm 00755 $installdir/usr/share/kotlin/bin
+    install -Dm 00755 $workdir/dist/kotlinc/bin/* $installdir/usr/share/kotlin/bin
+    sed -i "10r $pkgfiles/java-shim.txt" $installdir/usr/share/kotlin/bin/kotlinc
+
+    install -dm 00755 $installdir/usr/bin
+    for FILE in $(basename -a $installdir/usr/share/kotlin/bin/*); do
+        ln -s /usr/share/kotlin/bin/$FILE $installdir/usr/bin/$FILE
+    done
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -1,35 +1,103 @@
 <PISI>
     <Source>
         <Name>kotlin</Name>
+        <Homepage>https://kotlinlang.org/</Homepage>
         <Packager>
             <Name>Campbell Jones</Name>
-            <Email>contact@serebit.com</Email>
+            <Email>dev@serebit.com</Email>
         </Packager>
         <License>Apache-2.0</License>
         <PartOf>programming</PartOf>
-        <Summary xml:lang="en">Multiplatform programming language</Summary>
-        <Description xml:lang="en">Kotlin is a statically-typed programming language by JetBrains that runs on the Java virtual machine and also can be transpiled to JavaScript or compiled to native binaries via LLVM.
+        <Summary xml:lang="en">Statically typed multiplatform programming language</Summary>
+        <Description xml:lang="en">Kotlin is a modern, concise, and safe programming language by JetBrains. It can run on the Java virtual machine, can be transpiled to JavaScript, and can be compiled to native binaries via LLVM. This package contains the JVM and JS compilers.
 </Description>
-        <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://solus-project.com/sources/README.Solus</Archive>
+        <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://getsol.us/sources/README.Solus</Archive>
     </Source>
     <Package>
         <Name>kotlin</Name>
-        <Summary xml:lang="en">Multiplatform programming language</Summary>
-        <Description xml:lang="en">Kotlin is a statically-typed programming language by JetBrains that runs on the Java virtual machine and also can be transpiled to JavaScript or compiled to native binaries via LLVM.
+        <Summary xml:lang="en">Statically typed multiplatform programming language</Summary>
+        <Description xml:lang="en">Kotlin is a modern, concise, and safe programming language by JetBrains. It can run on the Java virtual machine, can be transpiled to JavaScript, and can be compiled to native binaries via LLVM. This package contains the JVM and JS compilers.
 </Description>
         <PartOf>programming</PartOf>
         <Files>
-            <Path fileType="executable">/usr/bin</Path>
-            <Path fileType="data">/usr/share/kotlin</Path>
+            <Path fileType="executable">/usr/bin/kapt</Path>
+            <Path fileType="executable">/usr/bin/kotlin</Path>
+            <Path fileType="executable">/usr/bin/kotlin-dce-js</Path>
+            <Path fileType="executable">/usr/bin/kotlinc</Path>
+            <Path fileType="executable">/usr/bin/kotlinc-js</Path>
+            <Path fileType="executable">/usr/bin/kotlinc-jvm</Path>
+            <Path fileType="data">/usr/share/kotlin/bin/kapt</Path>
+            <Path fileType="data">/usr/share/kotlin/bin/kotlin</Path>
+            <Path fileType="data">/usr/share/kotlin/bin/kotlin-dce-js</Path>
+            <Path fileType="data">/usr/share/kotlin/bin/kotlinc</Path>
+            <Path fileType="data">/usr/share/kotlin/bin/kotlinc-js</Path>
+            <Path fileType="data">/usr/share/kotlin/bin/kotlinc-jvm</Path>
+            <Path fileType="data">/usr/share/kotlin/lib/allopen-compiler-plugin.jar</Path>
+            <Path fileType="data">/usr/share/kotlin/lib/android-extensions-compiler.jar</Path>
+            <Path fileType="data">/usr/share/kotlin/lib/android-extensions-runtime.jar</Path>
+            <Path fileType="data">/usr/share/kotlin/lib/annotations-13.0.jar</Path>
+            <Path fileType="data">/usr/share/kotlin/lib/js.engines.jar</Path>
+            <Path fileType="data">/usr/share/kotlin/lib/jvm-abi-gen.jar</Path>
+            <Path fileType="data">/usr/share/kotlin/lib/kotlin-annotation-processing-cli.jar</Path>
+            <Path fileType="data">/usr/share/kotlin/lib/kotlin-annotation-processing-runtime.jar</Path>
+            <Path fileType="data">/usr/share/kotlin/lib/kotlin-annotation-processing.jar</Path>
+            <Path fileType="data">/usr/share/kotlin/lib/kotlin-annotations-android.jar</Path>
+            <Path fileType="data">/usr/share/kotlin/lib/kotlin-annotations-jvm-sources.jar</Path>
+            <Path fileType="data">/usr/share/kotlin/lib/kotlin-annotations-jvm.jar</Path>
+            <Path fileType="data">/usr/share/kotlin/lib/kotlin-ant.jar</Path>
+            <Path fileType="data">/usr/share/kotlin/lib/kotlin-compiler.jar</Path>
+            <Path fileType="data">/usr/share/kotlin/lib/kotlin-coroutines-experimental-compat-sources.jar</Path>
+            <Path fileType="data">/usr/share/kotlin/lib/kotlin-coroutines-experimental-compat.jar</Path>
+            <Path fileType="data">/usr/share/kotlin/lib/kotlin-daemon-client.jar</Path>
+            <Path fileType="data">/usr/share/kotlin/lib/kotlin-daemon.jar</Path>
+            <Path fileType="data">/usr/share/kotlin/lib/kotlin-imports-dumper-compiler-plugin.jar</Path>
+            <Path fileType="data">/usr/share/kotlin/lib/kotlin-main-kts.jar</Path>
+            <Path fileType="data">/usr/share/kotlin/lib/kotlin-preloader.jar</Path>
+            <Path fileType="data">/usr/share/kotlin/lib/kotlin-reflect-sources.jar</Path>
+            <Path fileType="data">/usr/share/kotlin/lib/kotlin-reflect.jar</Path>
+            <Path fileType="data">/usr/share/kotlin/lib/kotlin-runner.jar</Path>
+            <Path fileType="data">/usr/share/kotlin/lib/kotlin-script-runtime-sources.jar</Path>
+            <Path fileType="data">/usr/share/kotlin/lib/kotlin-script-runtime.jar</Path>
+            <Path fileType="data">/usr/share/kotlin/lib/kotlin-scripting-common.jar</Path>
+            <Path fileType="data">/usr/share/kotlin/lib/kotlin-scripting-compiler-impl.jar</Path>
+            <Path fileType="data">/usr/share/kotlin/lib/kotlin-scripting-compiler.jar</Path>
+            <Path fileType="data">/usr/share/kotlin/lib/kotlin-scripting-js.jar</Path>
+            <Path fileType="data">/usr/share/kotlin/lib/kotlin-scripting-jvm.jar</Path>
+            <Path fileType="data">/usr/share/kotlin/lib/kotlin-stdlib-jdk7-sources.jar</Path>
+            <Path fileType="data">/usr/share/kotlin/lib/kotlin-stdlib-jdk7.jar</Path>
+            <Path fileType="data">/usr/share/kotlin/lib/kotlin-stdlib-jdk8-sources.jar</Path>
+            <Path fileType="data">/usr/share/kotlin/lib/kotlin-stdlib-jdk8.jar</Path>
+            <Path fileType="data">/usr/share/kotlin/lib/kotlin-stdlib-js-sources.jar</Path>
+            <Path fileType="data">/usr/share/kotlin/lib/kotlin-stdlib-js.jar</Path>
+            <Path fileType="data">/usr/share/kotlin/lib/kotlin-stdlib-sources.jar</Path>
+            <Path fileType="data">/usr/share/kotlin/lib/kotlin-stdlib.jar</Path>
+            <Path fileType="data">/usr/share/kotlin/lib/kotlin-test-js-sources.jar</Path>
+            <Path fileType="data">/usr/share/kotlin/lib/kotlin-test-js.jar</Path>
+            <Path fileType="data">/usr/share/kotlin/lib/kotlin-test-junit-sources.jar</Path>
+            <Path fileType="data">/usr/share/kotlin/lib/kotlin-test-junit.jar</Path>
+            <Path fileType="data">/usr/share/kotlin/lib/kotlin-test-junit5-sources.jar</Path>
+            <Path fileType="data">/usr/share/kotlin/lib/kotlin-test-junit5.jar</Path>
+            <Path fileType="data">/usr/share/kotlin/lib/kotlin-test-sources.jar</Path>
+            <Path fileType="data">/usr/share/kotlin/lib/kotlin-test-testng-sources.jar</Path>
+            <Path fileType="data">/usr/share/kotlin/lib/kotlin-test-testng.jar</Path>
+            <Path fileType="data">/usr/share/kotlin/lib/kotlin-test.jar</Path>
+            <Path fileType="data">/usr/share/kotlin/lib/kotlinx-coroutines-core.jar</Path>
+            <Path fileType="data">/usr/share/kotlin/lib/kotlinx-serialization-compiler-plugin.jar</Path>
+            <Path fileType="data">/usr/share/kotlin/lib/mutability-annotations-compat.jar</Path>
+            <Path fileType="data">/usr/share/kotlin/lib/noarg-compiler-plugin.jar</Path>
+            <Path fileType="data">/usr/share/kotlin/lib/parcelize-compiler.jar</Path>
+            <Path fileType="data">/usr/share/kotlin/lib/parcelize-runtime.jar</Path>
+            <Path fileType="data">/usr/share/kotlin/lib/sam-with-receiver-compiler-plugin.jar</Path>
+            <Path fileType="data">/usr/share/kotlin/lib/trove4j.jar</Path>
         </Files>
     </Package>
     <History>
-        <Update release="1">
-            <Date>2018-03-25</Date>
-            <Version>1.2.31</Version>
+        <Update release="2">
+            <Date>2021-03-18</Date>
+            <Version>1.4.31</Version>
             <Comment>Packaging update</Comment>
             <Name>Campbell Jones</Name>
-            <Email>contact@serebit.com</Email>
+            <Email>dev@serebit.com</Email>
         </Update>
     </History>
 </PISI>
\ No newline at end of file