diff --git a/Makefile b/Makefile
index 11e8f624..c643b329 100644
--- a/Makefile
+++ b/Makefile
@@ -163,7 +163,7 @@ tfgen_build_only:
 
 upstream:
 ifneq ("$(wildcard upstream)","")
-	./upstream.sh init
+	./upstream.sh init -f
 endif
 
 bin/pulumi-java-gen: .pulumi-java-gen.version
diff --git a/upstream.sh b/upstream.sh
index d285aaa7..f56ca1a5 100755
--- a/upstream.sh
+++ b/upstream.sh
@@ -97,7 +97,7 @@ Either stage or reset the 'upstream' submodule changes before continuing:
 
     git add upstream
     # or #
-    git checkout upstream
+    (cd upstream && git checkout <current submodule commit of origin/default> && cd -)
 
 EOF
     exit 1