diff --git a/CHANGELOG.md b/CHANGELOG.md
index ea563b3f..c1c7f084 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -35,6 +35,7 @@
 - Add syntax test file for Odin highlighting, see #3241 (@chetanjangir0)
 - Update quadlet syntax mapping rules to cover quadlets in subdirectories #3299 (@cyqsimon)
 - Add syntax Typst #3300 (@cskeeters)
+- Map `.mill` files to Scala syntax for Mill build tool configuration files #3311 (@krikera)
 
 ## Themes
 
diff --git a/src/syntax_mapping/builtins/common/50-mill.toml b/src/syntax_mapping/builtins/common/50-mill.toml
new file mode 100644
index 00000000..1b35c0c1
--- /dev/null
+++ b/src/syntax_mapping/builtins/common/50-mill.toml
@@ -0,0 +1,2 @@
+[mappings]
+"Scala" = ["*.mill"]
\ No newline at end of file