diff --git a/README.md b/README.md
index 5856405..703bf72 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,7 @@ If you need full functionality of any plugin, please use it directly with your p
 - [css](https://github.com/JulesWang/css.vim) (syntax)
 - [cucumber](https://github.com/tpope/vim-cucumber) (syntax, indent, compiler, ftplugin, ftdetect)
 - [dart](https://github.com/dart-lang/dart-vim-plugin) (syntax, indent, autoload, ftplugin, ftdetect)
-- [dockerfile](https://github.com/honza/dockerfile.vim) (syntax, ftdetect)
+- [dockerfile](https://github.com/docker/docker) (syntax, ftdetect)
 - [elixir](https://github.com/elixir-lang/vim-elixir) (syntax, indent, compiler, autoload, ftplugin, ftdetect)
 - [elm](https://github.com/lambdatoast/elm.vim) (syntax, indent, autoload, ftplugin, ftdetect)
 - [emberscript](https://github.com/yalesov/vim-ember-script) (syntax, indent, ftplugin, ftdetect)
diff --git a/build b/build
index ff3b420..030afb1 100755
--- a/build
+++ b/build
@@ -117,7 +117,7 @@ PACKS="
   css:JulesWang/css.vim
   cucumber:tpope/vim-cucumber
   dart:dart-lang/dart-vim-plugin
-  dockerfile:honza/dockerfile.vim
+  dockerfile:docker/docker::/contrib/syntax/vim/
   elixir:elixir-lang/vim-elixir
   elm:lambdatoast/elm.vim
   emberscript:yalesov/vim-ember-script
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index edf87bb..57255ac 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -137,7 +137,7 @@ endif
 " ftdetect/dockerfile.vim
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dockerfile') == -1
   
-au BufNewFile,BufRead Dockerfile set filetype=dockerfile
+au BufNewFile,BufRead [Dd]ockerfile,Dockerfile.* set filetype=dockerfile
 
 endif
 
diff --git a/syntax/dockerfile.vim b/syntax/dockerfile.vim
index b3a669c..1c768de 100644
--- a/syntax/dockerfile.vim
+++ b/syntax/dockerfile.vim
@@ -1,7 +1,7 @@
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dockerfile') == -1
   
 " dockerfile.vim - Syntax highlighting for Dockerfiles
-" Maintainer:   Honza Pokorny <http://honza.ca>
+" Maintainer:   Honza Pokorny <https://honza.ca>
 " Version:      0.5
 
 
@@ -9,10 +9,11 @@ if exists("b:current_syntax")
     finish
 endif
 
+let b:current_syntax = "dockerfile"
+
 syntax case ignore
 
-syntax match dockerfileKeyword /\v^\s*(FROM|MAINTAINER|RUN|CMD|EXPOSE|ENV|ADD)\s/
-syntax match dockerfileKeyword /\v^\s*(ENTRYPOINT|VOLUME|USER|WORKDIR|COPY)\s/
+syntax match dockerfileKeyword /\v^\s*(ONBUILD\s+)?(ADD|ARG|CMD|COPY|ENTRYPOINT|ENV|EXPOSE|FROM|HEALTHCHECK|LABEL|MAINTAINER|RUN|SHELL|STOPSIGNAL|USER|VOLUME|WORKDIR)\s/
 highlight link dockerfileKeyword Keyword
 
 syntax region dockerfileString start=/\v"/ skip=/\v\\./ end=/\v"/
@@ -21,15 +22,14 @@ highlight link dockerfileString String
 syntax match dockerfileComment "\v^\s*#.*$"
 highlight link dockerfileComment Comment
 
-syntax include @DockerSh syntax/sh.vim
-try
-  syntax include @DockerSh after/syntax/sh.vim
-catch
-endtry
+set commentstring=#\ %s
 
-syntax region dockerShSnip matchgroup=DockerShGroup start="^\s*\%(RUN\|CMD\)\s\+" end="$" contains=@DockerSh
-highlight link DockerShGroup dockerfileKeyword
-
-let b:current_syntax = "dockerfile"
+" match "RUN", "CMD", and "ENTRYPOINT" lines, and parse them as shell
+let s:current_syntax = b:current_syntax
+unlet b:current_syntax
+syntax include @SH syntax/sh.vim
+let b:current_syntax = s:current_syntax
+syntax region shLine matchgroup=dockerfileKeyword start=/\v^\s*(RUN|CMD|ENTRYPOINT)\s/ end=/\v$/ contains=@SH
+" since @SH will handle "\" as part of the same line automatically, this "just works" for line continuation too, but with the caveat that it will highlight "RUN echo '" followed by a newline as if it were a block because the "'" is shell line continuation...  not sure how to fix that just yet (TODO)
 
 endif