diff --git a/data/Makefile.am b/data/Makefile.am
index 15d75adf72..149a5ce7de 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -29,6 +29,7 @@ filetypes_dist = \
 	filedefs/filetypes.d \
 	filedefs/filetypes.diff \
 	filedefs/filetypes.docbook \
+	filedefs/filetypes.Dockerfile.conf \
 	filedefs/filetypes.erlang \
 	filedefs/filetypes.f77 \
 	filedefs/filetypes.forth \
diff --git a/data/filedefs/filetypes.Dockerfile.conf b/data/filedefs/filetypes.Dockerfile.conf
new file mode 100644
index 0000000000..03358b37f4
--- /dev/null
+++ b/data/filedefs/filetypes.Dockerfile.conf
@@ -0,0 +1,14 @@
+[styling=Sh]
+
+[keywords]
+primary=ADD ARG CMD COPY ENTRYPOINT ENV EXPOSE FROM HEALTHCHECK LABEL MAINTAINER ONBUILD RUN SHELL STOPSIGNAL USER VOLUME WORKDIR
+
+[lexer_properties=Sh]
+
+[settings]
+lexer_filetype=Sh
+tag_parser=Sh
+extension=Dockerfile
+comment_single=#
+comment_use_indent=true
+context_action_cmd=xdg-open "https://docs.docker.com/engine/reference/builder/"
diff --git a/data/filetype_extensions.conf b/data/filetype_extensions.conf
index f686f30ade..3937d0231b 100644
--- a/data/filetype_extensions.conf
+++ b/data/filetype_extensions.conf
@@ -27,6 +27,7 @@ Cython=*.pyx;*.pxd;*.pxi;
 D=*.d;*.di;
 Diff=*.diff;*.patch;*.rej;
 Docbook=*.docbook;
+Dockerfile=Dockerfile;dockerfile;*.dockerfile;*.Dockerfile;Dockerfile.*;
 Erlang=*.erl;*.hrl;
 F77=*.f;*.for;*.ftn;*.f77;*.F;*.FOR;*.FTN;*.fpp;*.FPP;*.F77;
 Forth=*.fs;*.fth;
@@ -86,7 +87,7 @@ None=*;
 # Note: restarting is required after editing groups
 [Groups]
 Programming=Arduino;Clojure;CUDA;Cython;Genie;Groovy;Kotlin;Nim;Scala;Swift;
-Script=Graphviz;TypeScript;Meson;
+Script=Dockerfile;Graphviz;TypeScript;Meson;
 Markup=
 Misc=JSON;
 None=