diff --git a/gradle.properties b/gradle.properties
index 48727a39c..3ced00046 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ version = 1.17.1-R0.1-SNAPSHOT
 mcVersion = 1.17.1
 packageVersion = 1_17_R1
 
-paperCommit = 244b392f390afa7a4880e2207c7358fe195bd431
+paperCommit = d4318a6ebca2a3f2859ca0ef1b274192633c7d5e
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/scripts/upstreamCommit.sh b/scripts/upstreamCommit.sh
index 5a0d636b5..d1649d81c 100755
--- a/scripts/upstreamCommit.sh
+++ b/scripts/upstreamCommit.sh
@@ -1,26 +1,24 @@
 #!/usr/bin/env bash
+
+# requires curl & jq
+
+# upstreamCommit <oldHash> <newHash>
+# param: bashHash - the commit hash to use for comparing commits (baseHash...HEAD)
+
 (
 set -e
 PS1="$"
 
-function changelog() {
-    base=$(git ls-tree HEAD $1  | cut -d' ' -f3 | cut -f1)
-    cd $1 && git log --oneline ${base}...HEAD
-}
-paper=$(changelog .gradle/caches/paperweight/upstreams/paper)
+paper=$(curl -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/PaperMC/Paper/compare/$1...$2 | jq -r '.commits[] | "PaperMC/Paper@\(.sha[:7]) \(.commit.message | split("\r\n")[0] | split("\n")[0])"')
 
 updated=""
 logsuffix=""
-if [ ! -z "$paper" ]; then
+if [ ! -z "paper" ]; then
     logsuffix="$logsuffix\n\nPaper Changes:\n$paper"
     updated="Paper"
 fi
 disclaimer="Upstream has released updates that appear to apply and compile correctly"
 
-if [ ! -z "$1" ]; then
-    disclaimer="$@"
-fi
-
 log="${UP_LOG_PREFIX}Updated Upstream ($updated)\n\n${disclaimer}${logsuffix}"
 
 echo -e "$log" | git commit -F -