--- a/runtime/syntax/mib.vim
+++ b/runtime/syntax/mib.vim
@@ -1,22 +1,15 @@
 " Vim syntax file
-" Language:	Vim syntax file for SNMPv1 and SNMPv2 MIB and SMI files
-" Author:	David Pascoe <pascoedj@spamcop.net>
-" Written:	Wed Jan 28 14:37:23 GMT--8:00 1998
-" Last Changed:	Thu Feb 27 10:18:16 WST 2003
+" Language:        Vim syntax file for SNMPv1 and SNMPv2 MIB and SMI files
+" Maintainer:      Martin Smat <msmat@post.cz>
+" Original Author: David Pascoe <pascoedj@spamcop.net>
+" Written:     	   Wed Jan 28 14:37:23 GMT--8:00 1998
+" Last Changed:    Mon Mar 15 2010
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+if exists("b:current_syntax")
   finish
 endif
 
-if version >= 600
-  setlocal iskeyword=@,48-57,_,128-167,224-235,-,:,=
-else
-  set iskeyword=@,48-57,_,128-167,224-235,-,:,=
-endif
+setlocal iskeyword=@,48-57,_,128-167,224-235,-,:,=
 
 syn keyword mibImplicit ACCESS ANY AUGMENTS BEGIN BIT BITS BOOLEAN CHOICE
 syn keyword mibImplicit COMPONENTS CONTACT-INFO DEFINITIONS DEFVAL
@@ -47,31 +40,16 @@ syn keyword mibEpilogue test-function-as
 syn keyword mibEpilogue leaf-name
 syn keyword mibEpilogue DEFAULT contained
 
-syn match  mibComment		"\ *--.*$"
-syn match  mibNumber		"\<['0-9a-fA-FhH]*\>"
+syn match  mibComment   "\ *--.\{-}\(--\|$\)"
+syn match  mibNumber    "\<['0-9a-fA-FhH]*\>"
 syn region mibDescription start="\"" end="\"" contains=DEFAULT
 
-" 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_mib_syn_inits")
-  if version < 508
-    let did_mib_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-
-  HiLink mibImplicit	     Statement
-  HiLink mibComment	     Comment
-  HiLink mibConstants	     String
-  HiLink mibNumber	     Number
-  HiLink mibDescription      Identifier
-  HiLink mibEpilogue	     SpecialChar
-  HiLink mibValue	     Structure
-  delcommand HiLink
-endif
+hi def link mibImplicit	     Statement
+hi def link mibComment       Comment
+hi def link mibConstants     String
+hi def link mibNumber        Number
+hi def link mibDescription   Identifier
+hi def link mibEpilogue	     SpecialChar
+hi def link mibValue         Structure
 
 let b:current_syntax = "mib"
-
-" vim: ts=8