diff --git a/CHANGELOG.md b/CHANGELOG.md
index 090a019c..4143d9e5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 
 ## Features
 
+- Map justfile, Justfile, .justfile, and *.justfile to Makefile syntax highlighting, see #3623 (@zachvalenta)
 - Preserve `--diff` change markers and snip separators when `--plain` is set. Closes #3630, see #3643 (@mvanhorn)
 - Added support for `hidden_file_extensions` from `.sublime-syntax` files, see #3613 (@Matei02355)
 - Add word wrapping mode via `--wrap=word`, see #3597 (@veeceey)
diff --git a/src/syntax_mapping/builtins/common/50-just.toml b/src/syntax_mapping/builtins/common/50-just.toml
new file mode 100644
index 00000000..5ca19c85
--- /dev/null
+++ b/src/syntax_mapping/builtins/common/50-just.toml
@@ -0,0 +1,2 @@
+[mappings]
+"Makefile" = ["justfile", "Justfile", ".justfile", "*.justfile"]