diff --git a/Lua/lib/addrs/O/JP09.lua b/Lua/lib/addrs/O/JP09.lua
new file mode 100644
index 0000000..95ef8c7
--- /dev/null
+++ b/Lua/lib/addrs/O/JP09.lua
@@ -0,0 +1 @@
+-- dummy file; please edit O/US09.lua instead
diff --git a/Lua/lib/addrs/O/JP10.lua b/Lua/lib/addrs/O/JP10.lua
index 095d8de..57eb086 100644
--- a/Lua/lib/addrs/O/JP10.lua
+++ b/Lua/lib/addrs/O/JP10.lua
@@ -1 +1 @@
--- dummy file; please edit O US10.lua instead
+-- dummy file; please edit O/US10.lua instead
diff --git a/Lua/lib/addrs/O/JP11.lua b/Lua/lib/addrs/O/JP11.lua
index 68bad07..d2f49fe 100644
--- a/Lua/lib/addrs/O/JP11.lua
+++ b/Lua/lib/addrs/O/JP11.lua
@@ -1 +1 @@
--- dummy file; please edit O US11.lua instead
+-- dummy file; please edit O/US11.lua instead
diff --git a/Lua/lib/addrs/O/JP12.lua b/Lua/lib/addrs/O/JP12.lua
index 87baa20..6ea2e63 100644
--- a/Lua/lib/addrs/O/JP12.lua
+++ b/Lua/lib/addrs/O/JP12.lua
@@ -1 +1 @@
--- dummy file; please edit O US12.lua instead
+-- dummy file; please edit O/US12.lua instead
diff --git a/Lua/lib/addrs/O/US09.lua b/Lua/lib/addrs/O/US09.lua
new file mode 100644
index 0000000..a564707
--- /dev/null
+++ b/Lua/lib/addrs/O/US09.lua
@@ -0,0 +1 @@
+return {}
diff --git a/Lua/lib/addrs/addrs.lua b/Lua/lib/addrs/addrs.lua
index c830c28..2ced18b 100755
--- a/Lua/lib/addrs/addrs.lua
+++ b/Lua/lib/addrs/addrs.lua
@@ -2,10 +2,10 @@ local basics = require "addrs.basics"
 local versions = require "addrs.versions"
 
 local same = {
+    ["O JP09"] = "O US09",
     ["O JP10"] = "O US10",
     ["O JP11"] = "O US11",
     ["O JP12"] = "O US12",
-    --["O JPGC MQ"] = "O USGC", -- maybe?
 }
 
 rawset(_G, 'Actor', function() end)
diff --git a/Lua/lib/addrs/basics.lua b/Lua/lib/addrs/basics.lua
index fc904a5..6bed2de 100644
--- a/Lua/lib/addrs/basics.lua
+++ b/Lua/lib/addrs/basics.lua
@@ -204,4 +204,11 @@ return {
         actor  = 0x1E7E30,
         LLsize = 0x10,
     },
+
+    ["O US09"] = {
+        save   = 0x11A3C0,
+        global = 0x1C82A0,
+        actor  = 0x1DA830,
+        LLsize = 0x30,
+    },
 }
diff --git a/Lua/lib/addrs/versions.lua b/Lua/lib/addrs/versions.lua
index 098f696..8a6384c 100644
--- a/Lua/lib/addrs/versions.lua
+++ b/Lua/lib/addrs/versions.lua
@@ -76,6 +76,12 @@ return { -- md5 and sha1 hashes of .z64s
     ["8B88986EC8A637ED8C2FC5BF956FA949479B3430"] = "O BQ11", -- beta quest "V1" (no fix)
     ["FE2453E7BA38454F9C8BF219B0B89AE614CD08E9"] = "M USGC64",
 
+    -- leaked pre-release builds
+    ["21F7B4A4FF463464BFC23498C1AB9DA1"] = "O US09",
+    ["C92D3DB57CA14B7BB9CC9FB507BE6EA1"] = "O JP09",
+    ["70537A3144C8813B115252C40065C117CB139DCD"] = "O US09",
+    ["9B21840DE7D01B6A1546B310812B1EA7359AA3EB"] = "O JP09",
+
     -- leaked builds
     ["D0C048E282D8760F2806E7912AFF35AF"] = "O BB",
     ["6C2747FF2A0D4FE923E200E04D819708"] = "O BB2",