diff --git a/runtime/syntax/fstab.vim b/runtime/syntax/fstab.vim
index 3006d21..a17fc80 100644
--- a/runtime/syntax/fstab.vim
+++ b/runtime/syntax/fstab.vim
@@ -19,9 +19,8 @@
 "   let fstab_unknown_device_errors = 0
 "     do not highlight unknown devices as errors
 
-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
 
@@ -229,66 +228,59 @@
 " Whole line comments
 syn match fsCommentLine /^#.*$/ contains=@Spell
 
-if version >= 508 || !exists("did_config_syntax_inits")
-	if version < 508
-		let did_config_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 fsOperator Operator
-	HiLink fsComment Comment
-	HiLink fsCommentLine Comment
+HiLink fsOperator Operator
+HiLink fsComment Comment
+HiLink fsCommentLine Comment
 
-	HiLink fsTypeKeyword Type
-	HiLink fsDeviceKeyword Identifier
-	HiLink fsDeviceLabel String
-	HiLink fsDeviceUUID String
-	HiLink fsDeviceSshfs String
-	HiLink fsFreqPassNumber Number
+HiLink fsTypeKeyword Type
+HiLink fsDeviceKeyword Identifier
+HiLink fsDeviceLabel String
+HiLink fsDeviceUUID String
+HiLink fsDeviceSshfs String
+HiLink fsFreqPassNumber Number
 
-	if exists('fstab_unknown_fs_errors') && fstab_unknown_fs_errors == 1
-		HiLink fsTypeUnknown Error
-	endif
-
-	if !exists('fstab_unknown_device_errors') || fstab_unknown_device_errors == 1
-		HiLink fsDeviceError Error
-	endif
-
-	HiLink fsMountPointError Error
-	HiLink fsMountPointKeyword Keyword
-	HiLink fsFreqPassError Error
-
-	HiLink fsOptionsGeneral Type
-	HiLink fsOptionsKeywords Keyword
-	HiLink fsOptionsNumber Number
-	HiLink fsOptionsNumberOctal Number
-	HiLink fsOptionsString String
-	HiLink fsOptionsSize Number
-	HiLink fsOptionsExt2Check String
-	HiLink fsOptionsExt2Errors String
-	HiLink fsOptionsExt3Journal String
-	HiLink fsOptionsExt3Data String
-	HiLink fsOptionsExt4Journal String
-	HiLink fsOptionsExt4Data String
-	HiLink fsOptionsExt4Barrier Number
-	HiLink fsOptionsFatCheck String
-	HiLink fsOptionsConv String
-	HiLink fsOptionsFatType Number
-	HiLink fsOptionsYesNo String
-	HiLink fsOptionsHpfsCase String
-	HiLink fsOptionsIsoMap String
-	HiLink fsOptionsReiserHash String
-	HiLink fsOptionsSshYesNoAsk String
-	HiLink fsOptionsUfsType String
-	HiLink fsOptionsUfsError String
-
-	HiLink fsOptionsVfatShortname String
-
-	delcommand HiLink
+if exists('fstab_unknown_fs_errors') && fstab_unknown_fs_errors == 1
+HiLink fsTypeUnknown Error
 endif
 
+if !exists('fstab_unknown_device_errors') || fstab_unknown_device_errors == 1
+HiLink fsDeviceError Error
+endif
+
+HiLink fsMountPointError Error
+HiLink fsMountPointKeyword Keyword
+HiLink fsFreqPassError Error
+
+HiLink fsOptionsGeneral Type
+HiLink fsOptionsKeywords Keyword
+HiLink fsOptionsNumber Number
+HiLink fsOptionsNumberOctal Number
+HiLink fsOptionsString String
+HiLink fsOptionsSize Number
+HiLink fsOptionsExt2Check String
+HiLink fsOptionsExt2Errors String
+HiLink fsOptionsExt3Journal String
+HiLink fsOptionsExt3Data String
+HiLink fsOptionsExt4Journal String
+HiLink fsOptionsExt4Data String
+HiLink fsOptionsExt4Barrier Number
+HiLink fsOptionsFatCheck String
+HiLink fsOptionsConv String
+HiLink fsOptionsFatType Number
+HiLink fsOptionsYesNo String
+HiLink fsOptionsHpfsCase String
+HiLink fsOptionsIsoMap String
+HiLink fsOptionsReiserHash String
+HiLink fsOptionsSshYesNoAsk String
+HiLink fsOptionsUfsType String
+HiLink fsOptionsUfsError String
+
+HiLink fsOptionsVfatShortname String
+
+delcommand HiLink
+
 let b:current_syntax = "fstab"
 
 let &cpo = s:cpo_save