diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1893db4cda..b528c0e7b0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -53,6 +53,7 @@ _Breaking developer changes, which may affect downstream projects or sites that
 * Update Sinitic languages in the Multilingual Names field ([#10488], thanks [@winstonsung])
 * Update the list of languages in the Wikipedia field ([#10489])
 * Add Ladin (language code `lld`) as an available option for multilingual names
+* Add 30 indigenous languages as dropdown options for multilingual names ([#10684], thanks [@k-yle])
 #### :hourglass: Performance
 #### :mortar_board: Walkthrough / Help
 * Fix walkthrough from showing tooltips on wrong location under certain circumstances ([#10650], [#10624], [#10634])
@@ -71,6 +72,7 @@ _Breaking developer changes, which may affect downstream projects or sites that
 [#10624]: https://github.com/openstreetmap/iD/issues/10624
 [#10634]: https://github.com/openstreetmap/iD/issues/10634
 [#10650]: https://github.com/openstreetmap/iD/issues/10650
+[#10684]: https://github.com/openstreetmap/iD/pull/10684
 [@winstonsung]: https://github.com/winstonsung/
 [@Nekzuris]: https://github.com/Nekzuris
 [@michaelabon]: https://github.com/michaelabon
diff --git a/data/languages.json b/data/languages.json
index 4b0692c7f8..bb5598a2ed 100644
--- a/data/languages.json
+++ b/data/languages.json
@@ -7,6 +7,7 @@
   "ady": {},
   "ae": {},
   "aeb": {},
+  "aer": {"nativeName": "Arrernte"},
   "af": {"nativeName": "Afrikaans"},
   "afh": {},
   "agq": {"nativeName": "Aghem"},
@@ -22,6 +23,7 @@
   "ang": {},
   "ann": {"nativeName": "Obolo"},
   "anp": {},
+  "aoi": {"nativeName": "Anindilyakwa"},
   "apc": {"nativeName": "العامية"},
   "ar": {"nativeName": "العربية"},
   "arc": {},
@@ -37,6 +39,7 @@
   "asa": {"nativeName": "Kipare"},
   "ast": {"nativeName": "asturianu"},
   "atj": {},
+  "aus": {"nativeName": "Australian Aboriginal Languages"},
   "av": {},
   "avk": {},
   "awa": {},
@@ -55,6 +58,7 @@
   "bax": {},
   "bbc": {},
   "bbj": {},
+  "bdy": {"nativeName": "Yugambeh–Bandjalangic"},
   "be": {"nativeName": "беларуская"},
   "be-tarask": {},
   "bej": {},
@@ -122,6 +126,7 @@
   "ckb": {"nativeName": "کوردیی ناوەندی"},
   "clc": {},
   "co": {"nativeName": "corsu"},
+  "coa": {"nativeName": "Basa Pulu Kokos"},
   "cop": {},
   "cps": {},
   "cpx": {"nativeName": "莆仙語"},
@@ -152,6 +157,7 @@
   "del": {},
   "den": {},
   "dgr": {},
+  "dgw": {"nativeName": "Daungwurrung"},
   "din": {},
   "dje": {"nativeName": "Zarmaciine"},
   "doi": {"nativeName": "डोगरी"},
@@ -216,6 +222,8 @@
   "gd": {"nativeName": "Gàidhlig"},
   "gez": {},
   "gil": {},
+  "gjm": {"nativeName": "Gunditjmara"},
+  "gjr": {"nativeName": "Gurindji Kriol"},
   "gl": {"nativeName": "galego"},
   "glk": {},
   "gmh": {},
@@ -229,6 +237,7 @@
   "gsw": {"nativeName": "Schwiizertüütsch"},
   "gu": {"nativeName": "ગુજરાતી"},
   "guc": {},
+  "gup": {"nativeName": "Bininj Gun-Wok"},
   "gur": {},
   "guz": {"nativeName": "Ekegusii"},
   "gv": {"nativeName": "Gaelg"},
@@ -282,6 +291,7 @@
   "ja-Hira": {"base": "ja", "script": "Hira"},
   "ja-Latn": {"base": "ja", "script": "Latn"},
   "jam": {},
+  "jay": {"nativeName": "Yan-nhaŋu"},
   "jbo": {"nativeName": "la .lojban."},
   "jgo": {"nativeName": "Ndaꞌa"},
   "jmc": {"nativeName": "Kimachame"},
@@ -429,7 +439,9 @@
   "mt": {"nativeName": "Malti"},
   "mua": {"nativeName": "MUNDAŊ"},
   "mus": {"nativeName": "Mvskoke"},
+  "mwf": {"nativeName": "Murrinh-Patha"},
   "mwl": {},
+  "mwp": {"nativeName": "Kalaw Lagaw Ya"},
   "mwr": {},
   "mwv": {},
   "my": {"nativeName": "မြန်မာ"},
@@ -470,6 +482,7 @@
   "nym": {},
   "nyn": {"nativeName": "Runyankore"},
   "nyo": {},
+  "nys": {"nativeName": "Nyungar"},
   "nzi": {},
   "oc": {"nativeName": "occitan"},
   "oj": {},
@@ -498,7 +511,10 @@
   "pfl": {},
   "phn": {},
   "pi": {},
+  "pih": {"nativeName": "Pitkern–Norfolk"},
   "pis": {"nativeName": "Pijin"},
+  "piu": {"nativeName": "Pintupi"},
+  "pjt": {"nativeName": "Pitjantjatjara"},
   "pl": {"nativeName": "polski"},
   "pms": {},
   "pnb": {"nativeName": "پنجابی"},
@@ -524,6 +540,8 @@
   "ro": {"nativeName": "română"},
   "rof": {"nativeName": "Kihorombo"},
   "rom": {},
+  "rop": {"nativeName": "Australian Kriol"},
+  "rrm": {"nativeName": "Moriori"},
   "rtm": {},
   "ru": {"nativeName": "русский"},
   "rue": {},
@@ -609,6 +627,7 @@
   "szl": {"nativeName": "ślōnski"},
   "ta": {"nativeName": "தமிழ்"},
   "tce": {},
+  "tcs": {"nativeName": "Yumplatok"},
   "tcy": {},
   "te": {"nativeName": "తెలుగు"},
   "tem": {},
@@ -622,6 +641,7 @@
   "ti": {"nativeName": "ትግርኛ"},
   "tig": {},
   "tiv": {},
+  "tiw": {"nativeName": "Tiwi"},
   "tk": {"nativeName": "türkmen dili"},
   "tkl": {},
   "tkr": {},
@@ -656,6 +676,7 @@
   "ug": {"nativeName": "ئۇيغۇرچە"},
   "uga": {},
   "uk": {"nativeName": "українська"},
+  "ulk": {"nativeName": "Meriam Mir"},
   "umb": {},
   "ur": {"nativeName": "اردو"},
   "uz": {"nativeName": "o‘zbek"},
@@ -683,15 +704,23 @@
   "was": {},
   "wbl": {"nativeName": "وخی"},
   "wbp": {"nativeName": "Warlpiri"},
+  "wlp": {"nativeName": "Warlpiri"},
   "wo": {"nativeName": "Wolof"},
+  "wrh": {"nativeName": "Wiradjuri"},
+  "wth": {"nativeName": "Wathawurrung"},
   "wuu": {"nativeName": "吳語"},
   "wuu-Hans": {"base": "wuu", "script": "Hans", "nativeName": "吴语（简体）"},
   "wuu-Hant": {"base": "wuu", "script": "Hant", "nativeName": "吳語（正體）"},
+  "wyi": {"nativeName": "Woiwurrung"},
   "xal": {},
+  "xdk": {"nativeName": "Dharug"},
   "xh": {"nativeName": "IsiXhosa"},
   "xmf": {},
+  "xni": {"nativeName": "Ngarigo"},
   "xnr": {"nativeName": "कांगड़ी"},
   "xog": {"nativeName": "Olusoga"},
+  "xph": {"nativeName": "Tyerrernotepanner"},
+  "xrd": {"nativeName": "Gundungurra"},
   "yao": {},
   "yap": {},
   "yav": {"nativeName": "nuasue"},
@@ -712,6 +741,7 @@
   "zh-Hans": {"base": "zh", "script": "Hans", "nativeName": "简体中文"},
   "zh-Hant": {"base": "zh", "script": "Hant", "nativeName": "繁體中文"},
   "zh-Latn-pinyin": {"base": "zh", "script": "Latn", "nativeName": "Zhōngwén (Hànyǔ Pīnyīn)"},
+  "zku": {"nativeName": "Kaurna"},
   "zu": {"nativeName": "isiZulu"},
   "zun": {},
   "zza": {}
diff --git a/scripts/language_names.js b/scripts/language_names.js
index df3ff96de5..c68d280875 100644
--- a/scripts/language_names.js
+++ b/scripts/language_names.js
@@ -19,6 +19,10 @@ function getLangNamesInNativeLang() {
   // manually add languages we want that aren't in CLDR
   // see for example https://github.com/openstreetmap/iD/pull/9241/
   let unordered = {
+    aer: { nativeName: 'Arrernte' },
+    aoi: { nativeName: 'Anindilyakwa' },
+    aus: { nativeName: 'Australian Aboriginal Languages' },
+    bdy: { nativeName: 'Yugambeh–Bandjalangic' },
     'bft': {
       nativeName: 'بلتی'
     },
@@ -28,6 +32,7 @@ function getLangNamesInNativeLang() {
     'brh': {
       nativeName: 'براہوئی'
     },
+    coa: { nativeName: 'Basa Pulu Kokos' },
     'cdo': {
       nativeName: '閩東語'
     },
@@ -64,6 +69,7 @@ function getLangNamesInNativeLang() {
       script: 'Latn',
       nativeName: 'Pó-sing-gṳ̂ (Báⁿ-uā-ci̍)'
     },
+    dgw: { nativeName: 'Daungwurrung' },
     'gan': {
       nativeName: '贛語'
     },
@@ -77,6 +83,9 @@ function getLangNamesInNativeLang() {
       script: 'Hant',
       nativeName: '贛語（繁體）'
     },
+    gjm: { nativeName: 'Gunditjmara' },
+    gjr: { nativeName: 'Gurindji Kriol' },
+    gup: { nativeName: 'Bininj Gun-Wok' },
     'hak': {
       nativeName: '客家語'
     },
@@ -106,6 +115,7 @@ function getLangNamesInNativeLang() {
       base: 'ja',
       script: 'Latn'
     },
+    jay: { nativeName: 'Yan-nhaŋu' },
     'kls': {
       nativeName: 'Kal\'as\'amondr'
     },
@@ -123,6 +133,8 @@ function getLangNamesInNativeLang() {
       script: 'Mong',
       nativeName: 'ᠮᠠᠨᠵᡠ ᡤᡳᠰᡠᠨ'
     },
+    mwf: { nativeName: 'Murrinh-Patha' },
+    mwp: { nativeName: 'Kalaw Lagaw Ya' },
     'nan': {
       nativeName: '閩南語'
     },
@@ -141,12 +153,18 @@ function getLangNamesInNativeLang() {
       script: 'Latn',
       nativeName: 'Bân-lâm-gú (Tâi-lô)'
     },
+    nys: { nativeName: 'Nyungar' },
     'oc': {
       nativeName: 'Occitan'
     },
+    pih: { nativeName: 'Pitkern–Norfuk' },
+    piu: { nativeName: 'Pintupi' },
+    pjt: { nativeName: 'Pitjantjatjara' },
     'pnb': {
       nativeName: 'پنجابی'
     },
+    rop: { nativeName: 'Australian Kriol' },
+    rrm: { nativeName: 'Moriori' },
     'scl': {
       nativeName: 'ݜݨیاٗ'
     },
@@ -156,12 +174,16 @@ function getLangNamesInNativeLang() {
     'skr': {
       nativeName: 'سرائیکی'
     },
+    tcs: { nativeName: 'Yumplatok' },
+    tiw: { nativeName: 'Tiwi' },
     'trw': {
       nativeName: 'توروالی'
     },
+    ulk: { nativeName: 'Meriam Mir' },
     'wbl': {
       nativeName: 'وخی'
     },
+    wlp: { nativeName: 'Warlpiri' },
     'wuu': {
       nativeName: '吳語'
     },
@@ -175,6 +197,13 @@ function getLangNamesInNativeLang() {
       script: 'Hant',
       nativeName: '吳語（正體）'
     },
+    wrh: { nativeName: 'Wiradjuri' },
+    wth: { nativeName: 'Wathawurrung' },
+    wyi: { nativeName: 'Woiwurrung' },
+    xdk: { nativeName: 'Dharug' },
+    xni: { nativeName: 'Ngarigo' },
+    xph: { nativeName: 'Tyerrernotepanner' },
+    xrd: { nativeName: 'Gundungurra' },
     'yue-Hans': {
       base: 'yue',
       script: 'Hans',
@@ -189,7 +218,8 @@ function getLangNamesInNativeLang() {
       base: 'zh',
       script: 'Latn',
       nativeName: 'Zhōngwén (Hànyǔ Pīnyīn)'
-    }
+    },
+    zku: { nativeName: 'Kaurna' },
   };
 
   let langDirectoryPaths = fs.readdirSync(cldrMainDir);