diff --git a/runtime/syntax/vhdl.vim b/runtime/syntax/vhdl.vim
index 3250382..4a54216 100644
--- a/runtime/syntax/vhdl.vim
+++ b/runtime/syntax/vhdl.vim
@@ -5,9 +5,8 @@
 " Credits:		Stephan Hegel <stephan.hegel@snc.siemens.com.cn>
 " Last Changed:		2016 Mar 05 by Daniel Kho
 
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -234,35 +233,27 @@
 syn sync	minlines=600
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_vhdl_syntax_inits")
-    if version < 508
-	let did_vhdl_syntax_inits = 1
-	command -nargs=+ HiLink hi link <args>
-    else
-	command -nargs=+ HiLink hi def link <args>
-    endif
-    
-    HiLink	vhdlSpecial	Special
-    HiLink	vhdlStatement   Statement
-    HiLink	vhdlCharacter   Character
-    HiLink	vhdlString	String
-    HiLink	vhdlVector	Number
-    HiLink	vhdlBoolean	Number
-    HiLink	vhdlTodo	Todo
-    HiLink	vhdlFixme	Fixme
-    HiLink	vhdlComment	Comment
-    HiLink	vhdlNumber	Number
-    HiLink	vhdlTime	Number
-    HiLink	vhdlType	Type
-    HiLink	vhdlOperator    Operator
-    HiLink	vhdlError	Error
-    HiLink	vhdlAttribute   Special
-    HiLink	vhdlPreProc	PreProc
-    
-    delcommand HiLink
-endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
+
+HiLink	vhdlSpecial	Special
+HiLink	vhdlStatement   Statement
+HiLink	vhdlCharacter   Character
+HiLink	vhdlString	String
+HiLink	vhdlVector	Number
+HiLink	vhdlBoolean	Number
+HiLink	vhdlTodo	Todo
+HiLink	vhdlFixme	Fixme
+HiLink	vhdlComment	Comment
+HiLink	vhdlNumber	Number
+HiLink	vhdlTime	Number
+HiLink	vhdlType	Type
+HiLink	vhdlOperator    Operator
+HiLink	vhdlError	Error
+HiLink	vhdlAttribute   Special
+HiLink	vhdlPreProc	PreProc
+
+delcommand HiLink
 
 let b:current_syntax = "vhdl"