diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5bde57b5c..3e409fef9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -56,6 +56,7 @@ _Breaking developer changes, which may affect downstream projects or sites that
 * Fix address field overwriting existing data when switching selected map features under certain circumstances ([#10260])
 * Show `name` field also when only a localized name is present (e.g. only `name:xy`, but not `name`) and the preset does not show the name field by default ([#10323], thanks [@samhoooo])
 #### :earth_asia: Localization
+* Add address format for Thailand ([#10291], thanks [@cmoffroad])
 #### :hourglass: Performance
 #### :mortar_board: Walkthrough / Help
 #### :rocket: Presets
@@ -72,10 +73,12 @@ _Breaking developer changes, which may affect downstream projects or sites that
 [#10255]: https://github.com/openstreetmap/iD/pull/10255
 [#10257]: https://github.com/openstreetmap/iD/pull/10257
 [#10260]: https://github.com/openstreetmap/iD/issues/10260
+[#10291]: https://github.com/openstreetmap/iD/pull/10291
 [#10302]: https://github.com/openstreetmap/iD/issues/10302
 [#10323]: https://github.com/openstreetmap/iD/issues/10323
 [@zbycz]: https://github.com/zbycz
 [@samhoooo]: https://github.com/samhoooo
+[@cmoffroad]: https://github.com/cmoffroad
 
 
 # 2.29.0
diff --git a/data/address_formats.json b/data/address_formats.json
index ea4bf3bd2..60350842b 100644
--- a/data/address_formats.json
+++ b/data/address_formats.json
@@ -284,5 +284,14 @@
       ["postcode", "city"],
       ["street", "housenumber"]
     ]
+  },
+  {
+    "countryCodes": ["th"],
+    "format": [
+      ["housenumber", "place"],
+      ["street"],
+      ["subdistrict", "district"],
+      ["province", "postcode"]
+    ]
   }
 ]