diff --git a/runtime/syntax/xkb.vim b/runtime/syntax/xkb.vim
index ff9bfd0..efb7d66 100644
--- a/runtime/syntax/xkb.vim
+++ b/runtime/syntax/xkb.vim
@@ -6,12 +6,9 @@
 " URL: http://trific.ath.cx/Ftp/vim/syntax/xkb.vim
 
 " Setup
-if version >= 600
-	if exists("b:current_syntax")
-		finish
-	endif
-else
-	syntax clear
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+	finish
 endif
 
 syn case match
@@ -50,42 +47,35 @@
 syn keyword xkbSect alphanumeric_keys alternate_group function_keys keypad_keys modifier_keys xkb_compatibility xkb_geometry xkb_keycodes xkb_keymap xkb_semantics xkb_symbols xkb_types
 
 " Define the default highlighting
-if version >= 508 || !exists("did_xkb_syntax_inits")
-	if version < 508
-		let did_xkb_syntax_inits = 1
-		command -nargs=+ HiLink hi link <args>
-	else
-		command -nargs=+ HiLink hi def link <args>
-	endif
+command -nargs=+ HiLink hi def link <args>
 
-	HiLink xkbModif xkbPreproc
-	HiLink xkbTModif xkbPreproc
-	HiLink xkbPreproc Preproc
+HiLink xkbModif xkbPreproc
+HiLink xkbTModif xkbPreproc
+HiLink xkbPreproc Preproc
 
-	HiLink xkbIdentifier Keyword
-	HiLink xkbFunction Function
-	HiLink xkbSect Type
-	HiLink xkbPhysicalKey Identifier
-	HiLink xkbKeyword Keyword
+HiLink xkbIdentifier Keyword
+HiLink xkbFunction Function
+HiLink xkbSect Type
+HiLink xkbPhysicalKey Identifier
+HiLink xkbKeyword Keyword
 
-	HiLink xkbComment Comment
-	HiLink xkbTodo Todo
+HiLink xkbComment Comment
+HiLink xkbTodo Todo
 
-	HiLink xkbConstant Constant
-	HiLink xkbString String
+HiLink xkbConstant Constant
+HiLink xkbString String
 
-	HiLink xkbSpecialChar xkbSpecial
-	HiLink xkbSpecial Special
+HiLink xkbSpecialChar xkbSpecial
+HiLink xkbSpecial Special
 
-	HiLink xkbParenError xkbBalancingError
-	HiLink xkbBraceError xkbBalancingError
-	HiLink xkbBraketError xkbBalancingError
-	HiLink xkbBalancingError xkbError
-	HiLink xkbCommentStartError xkbCommentError
-	HiLink xkbCommentError xkbError
-	HiLink xkbError Error
+HiLink xkbParenError xkbBalancingError
+HiLink xkbBraceError xkbBalancingError
+HiLink xkbBraketError xkbBalancingError
+HiLink xkbBalancingError xkbError
+HiLink xkbCommentStartError xkbCommentError
+HiLink xkbCommentError xkbError
+HiLink xkbError Error
 
-	delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "xkb"