diff --git a/contrib/syntax/textmate/Dockerfile.tmLanguage b/contrib/syntax/textmate/Dockerfile.tmLanguage
index 94aa8975ad..5d6aa53618 100644
--- a/contrib/syntax/textmate/Dockerfile.tmLanguage
+++ b/contrib/syntax/textmate/Dockerfile.tmLanguage
@@ -12,7 +12,7 @@
 	<array>
 		<dict>
 			<key>match</key>
-			<string>^\s*(ONBUILD|)\s*(FROM|MAINTAINER|RUN|EXPOSE|ENV|ADD|VOLUME|USER|WORKDIR)\s</string>
+			<string>^\s*(ONBUILD\s+)?(FROM|MAINTAINER|RUN|EXPOSE|ENV|ADD|VOLUME|USER|WORKDIR)\s</string>
 			<key>captures</key>
 			<dict>
 				<key>0</key>
@@ -29,7 +29,7 @@
 		</dict>
 		<dict>
 			<key>match</key>
-			<string>^\s*(ONBUILD|)\s*(CMD|ENTRYPOINT)\s</string>
+			<string>^\s*(ONBUILD\s+)?(CMD|ENTRYPOINT)\s</string>
 			<key>captures</key>
 			<dict>
 				<key>0</key>