diff --git a/rc/extra/just.kak b/rc/extra/just.kak
new file mode 100644
index 00000000..3fc18d08
--- /dev/null
+++ b/rc/extra/just.kak
@@ -0,0 +1,55 @@
+# Detection
+# ‾‾‾‾‾‾‾‾‾
+
+hook global BufCreate .*/?[jJ]ustfile %{
+    set-option buffer filetype justfile
+}
+
+# Indentation
+# ‾‾‾‾‾‾‾‾‾‾‾
+
+define-command -hidden just-indent-on-new-line %{
+     evaluate-commands -draft -itersel %{
+        # preserve previous line indent
+        try %{ execute-keys -draft \;K<a-&> }
+        # cleanup trailing white spaces on previous line
+        try %{ execute-keys -draft k<a-x> s \h+$ <ret>"_d }
+        # copy '#' comment prefix and following white spaces
+        try %{ execute-keys -draft k <a-x> s ^\h*//\h* <ret> y jgh P }
+    }
+}
+
+# Highlighters
+# ‾‾‾‾‾‾‾‾‾‾‾‾
+
+add-highlighter shared/ regions -default content justfile \
+    comment  '#' '$'  ''                 \
+    double_string '"' (?<!\\)(\\\\)*" '' \
+    single_string "'" (?<!\\)(\\\\)*' '' \
+    inline   '`' '`' ''                  \
+    shell    '^\h+' '^[^\h]' ''
+
+add-highlighter shared/justfile/comment fill comment
+add-highlighter shared/justfile/single_string fill string
+add-highlighter shared/justfile/double_string fill string
+add-highlighter shared/justfile/shell ref sh
+add-highlighter shared/justfile/inline ref sh
+
+add-highlighter shared/justfile/content regex '^(@)?([\w-]+)(?:\s(.+))?\s?(:)(.+)?$' 1:operator 2:function 3:value 4:operator 5:type
+add-highlighter shared/justfile/content regex '([=+])' 1:operator
+add-highlighter shared/justfile/content regex '^([\w-]+)\s=' 1:value
+
+hook global WinSetOption filetype=justfile %{
+    hook window InsertChar \n -group justfile-indent just-indent-on-new-line
+    add-highlighter window ref justfile
+
+    # variable substititution highlighting
+    add-highlighter shared/justfile/shell regex '(\{{2})([\w-]+)(\}{2})' 1:operator 2:variable 3:operator
+
+}
+
+hook global WinSetOption filetype=(?!justfile).* %{
+    remove-highlighter window/justfile
+    remove-hooks window justfile-indent
+}
+