diff --git a/gluon b/gluon
index 5e46753ad7564b3c2acea30de1b69e4a801a92c4..4863680b371fa8a5ce6e9bfc6fba23dbb4d93c0b 160000
--- a/gluon
+++ b/gluon
@@ -1 +1 @@
-Subproject commit 5e46753ad7564b3c2acea30de1b69e4a801a92c4
+Subproject commit 4863680b371fa8a5ce6e9bfc6fba23dbb4d93c0b
diff --git a/scripts/update-gluon.sh b/scripts/update-gluon.sh
index 925bc0e87a1bcc804be09fb8b4f08ea041cd8150..306e9c2a4b15506d5a80aefe1c437115f7670189 100755
--- a/scripts/update-gluon.sh
+++ b/scripts/update-gluon.sh
@@ -27,12 +27,18 @@ verify_remotes() {
 verify_remotes
 
 git -C "$gluon_path" fetch origin --tags
+git -C "$gluon_path" fetch upstream --tags
 
 git -C "$gluon_path" fetch upstream "$tag_to_update_to"
 
 current_tag_name=$(git -C "$gluon_path" describe)
 current_upstream_tag_name=${current_tag_name/-ffs*/}
 
+echo Detected current tag: $current_tag_name
+echo Detected upstream tag: $current_upstream_tag_name
+echo Looks OK?
+read
+
 git -C "$gluon_path" checkout -b "$tag_to_update_to-ffs"
 
 git -C "$gluon_path" rebase -i "$current_upstream_tag_name" --onto FETCH_HEAD