diff --git a/runtime/ftplugin/dockerfile.vim b/runtime/ftplugin/dockerfile.vim
index 2e3c447..e45bf4c 100644
--- a/runtime/ftplugin/dockerfile.vim
+++ b/runtime/ftplugin/dockerfile.vim
@@ -1,7 +1,7 @@
 " Vim filetype plugin
 " Language:	Dockerfile
 " Maintainer:   Honza Pokorny <http://honza.ca>
-" Last Change:	2014 Aug 29
+" Last Change:	2024 Dec 20
 
 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin")
@@ -11,6 +11,6 @@
 " Don't load another plugin for this buffer
 let b:did_ftplugin = 1
 
-let b:undo_ftplugin = "setl commentstring<"
-
 setlocal commentstring=#\ %s
+
+let b:undo_ftplugin = "setl commentstring<"
diff --git a/runtime/syntax/dockerfile.vim b/runtime/syntax/dockerfile.vim
index 6ec71fc..f1d612f 100644
--- a/runtime/syntax/dockerfile.vim
+++ b/runtime/syntax/dockerfile.vim
@@ -1,6 +1,6 @@
 " dockerfile.vim - Syntax highlighting for Dockerfiles
 " Maintainer:   Honza Pokorny <https://honza.ca>
-" Last Change:  2024 Jul 03
+" Last Change:  2024 Dec 20
 " License:      BSD
 
 " https://docs.docker.com/engine/reference/builder/
@@ -35,7 +35,6 @@
 syntax region dockerfileValue  contained keepend start=/\v/ skip=/\v\\\_./ end=/\v$/ contains=dockerfileString
 
 syntax region dockerfileComment start=/\v^\s*#/ end=/\v$/ contains=@Spell
-set commentstring=#\ %s
 
 hi def link dockerfileString String
 hi def link dockerfileKeyword Keyword