diff --git a/.gitmodules b/.gitmodules
index 83c95bab23b..d4be2245bf9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -12,8 +12,8 @@
     branch = main
 [submodule "external/Java.Interop"]
     path = external/Java.Interop
-    url = https://github.com/xamarin/java.interop.git
-    branch = main
+    url = https://github.com/jonpryor/java.interop.git
+    branch = jonp-net6-versioning
 [submodule "external/lz4"]
     path = external/lz4
     url = https://github.com/lz4/lz4.git
diff --git a/external/Java.Interop b/external/Java.Interop
index 32635fd67bf..2f1234cbda5 160000
--- a/external/Java.Interop
+++ b/external/Java.Interop
@@ -1 +1 @@
-Subproject commit 32635fd67bfc74fbb7d0370d1bc75bd13c838b61
+Subproject commit 2f1234cbda594a795ed14fe834aef3814df49157