updated for version 7.0216
diff --git a/runtime/syntax/logtalk.vim b/runtime/syntax/logtalk.vim
index eee998d..6faf596 100644
--- a/runtime/syntax/logtalk.vim
+++ b/runtime/syntax/logtalk.vim
@@ -2,7 +2,7 @@
 "
 " Language:	Logtalk
 " Maintainer:	Paulo Moura <pmoura@logtalk.org>
-" Last Change:	June 6, 2005
+" Last Change:	February 24, 2006
 
 
 " Quit when a syntax file was already loaded:
@@ -89,6 +89,14 @@
 syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- uses("		matchgroup=logtalkDirTag	end=")\."	contains=ALL
 
 
+" Module directives
+
+syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- module("		matchgroup=logtalkDirTag	end=")\."	contains=ALL
+syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- export("		matchgroup=logtalkDirTag	end=")\."	contains=ALL
+syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- meta_predicate("		matchgroup=logtalkDirTag	end=")\."	contains=ALL
+syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- use_module("		matchgroup=logtalkDirTag	end=")\."	contains=ALL
+
+
 " Logtalk built-in predicates
 
 syn match	logtalkBuiltIn		"\<\(abolish\|c\(reate\|urrent\)\)_\(object\|protocol\|category\)\ze("
@@ -129,6 +137,7 @@
 syn match	logtalkBuiltInMethod	"\<after\ze("
 
 syn match	logtalkBuiltInMethod	"\<expand_term\ze("
+syn match	logtalkBuiltInMethod	"\<term_expansion\ze("
 syn match	logtalkBuiltInMethod	"\<phrase\ze("
 
 
diff --git a/runtime/syntax/rd.vim b/runtime/syntax/rd.vim
deleted file mode 100644
index b08e4b2..0000000
--- a/runtime/syntax/rd.vim
+++ /dev/null
@@ -1,162 +0,0 @@
-" Vim syntax file
-" Language:    R Help File
-" Maintainer:  Johannes Ranke <jranke@uni-bremen.de>
-" Last Change: 2006 Mär 01
-" Version:     0.5
-" Remarks:     - Now includes R syntax highlighting in the appropriate
-"                sections if an r.vim file is in the same directory or in the
-"                default debian location.
-"              - I didn't yet include any special markup for S4 methods.
-"              - The two versions of \item{}{} markup are not 
-"                distinguished (in the \arguments{} environment, the items to
-"                be described are R identifiers, but not in the \describe{}
-"                environment).
-"              - There is no Latex markup in equations
-
-" Version Clears: {{{1
-" 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")
-  finish
-endif 
-
-syn case match
-
-" Rd identifiers {{{
-syn region rdIdentifier matchgroup=rdSection	start="\\name{" end="}" 
-syn region rdIdentifier matchgroup=rdSection	start="\\alias{" end="}" 
-syn region rdIdentifier matchgroup=rdSection	start="\\pkg{" end="}" 
-syn region rdIdentifier matchgroup=rdSection	start="\\item{" end="}" contained
-syn region rdIdentifier matchgroup=rdSection start="\\method{" end=/}/ contained
-
-" Highlighting of R code using an existing r.vim syntax file if available {{{1
-let s:syntaxdir = expand("<sfile>:p:h") "look in the directory of this file
-let s:rsyntax = s:syntaxdir . "/r.vim"
-if filereadable(s:rsyntax)  
-  syn include @R <sfile>:p:h/r.vim
-elseif filereadable('/usr/share/vim/vim64/syntax/r.vim')  "and debian location
-  syn include @R /usr/share/vim/vimcurrent/syntax/r.vim
-else 
-  syn match rdRComment /\#.*/				"if no r.vim is found, do comments
-  syn cluster R contains=rdRComment 
-endif
-syn region rdRcode matchgroup=Delimiter start="\\examples{" matchgroup=Delimiter transparent end=/}/ contains=@R,rdSection
-syn region rdRcode matchgroup=Delimiter start="\\usage{" matchgroup=Delimiter transparent end=/}/ contains=@R,rdIdentifier
-syn region rdRcode matchgroup=Delimiter start="\\synopsis{" matchgroup=Delimiter transparent end=/}/ contains=@R
-syn region rdRcode matchgroup=Delimiter start="\\special{" matchgroup=Delimiter transparent end=/}/ contains=@R contained
-syn region rdRcode matchgroup=Delimiter start="\\code{" matchgroup=Delimiter transparent end=/}/ contains=@R contained
-
-" Strings {{{1
-syn region rdString start=/"/ end=/"/ 
-
-" Special TeX characters  ( \$ \& \% \# \{ \} \_) {{{1
-syn match rdSpecialChar        "\\[$&%#{}_]"
-
-" Special Delimiters {{{1
-syn match rdDelimiter		"\\cr"
-syn match rdDelimiter		"\\tab "
-
-" Keywords {{{1
-syn match rdKeyword	"\\R"
-syn match rdKeyword	"\\dots"
-syn match rdKeyword	"\\ldots"
-
-" Links {{{1
-syn region rdLink matchgroup=rdSection start="\\link{" end="}" contained keepend
-syn region rdLink matchgroup=rdSection start="\\link\[.*\]{" end="}" contained keepend
-
-" Type Styles {{{1
-syn match rdType		"\\emph\>"
-syn match rdType		"\\strong\>"
-syn match rdType		"\\bold\>"
-syn match rdType		"\\sQuote\>"
-syn match rdType		"\\dQuote\>"
-syn match rdType		"\\code\>"
-syn match rdType		"\\preformatted\>"
-syn match rdType		"\\kbd\>"
-syn match rdType		"\\samp\>"
-syn match rdType		"\\eqn\>"
-syn match rdType		"\\deqn\>"
-syn match rdType		"\\file\>"
-syn match rdType		"\\email\>"
-syn match rdType		"\\url\>"
-syn match rdType		"\\var\>"
-syn match rdType		"\\env\>"
-syn match rdType		"\\option\>"
-syn match rdType		"\\command\>"
-syn match rdType		"\\dfn\>"
-syn match rdType		"\\cite\>"
-syn match rdType		"\\acronym\>"
-
-" Rd sections {{{1
-syn match rdSection		"\\encoding\>"
-syn match rdSection		"\\title\>"
-syn match rdSection		"\\description\>"
-syn match rdSection		"\\concept\>"
-syn match rdSection		"\\arguments\>"
-syn match rdSection		"\\details\>"
-syn match rdSection		"\\value\>"
-syn match rdSection		"\\references\>"
-syn match rdSection		"\\note\>"
-syn match rdSection		"\\author\>"
-syn match rdSection		"\\seealso\>"
-syn match rdSection		"\\keyword\>"
-syn match rdSection		"\\docType\>"
-syn match rdSection		"\\format\>"
-syn match rdSection		"\\source\>"
-syn match rdSection     "\\itemize\>"
-syn match rdSection     "\\describe\>"
-syn match rdSection     "\\enumerate\>"
-syn match rdSection     "\\item "
-syn match rdSection     "\\item$"
-syn match rdSection		"\\tabular{[lcr]*}"
-syn match rdSection		"\\dontrun\>"
-syn match rdSection		"\\dontshow\>"
-syn match rdSection		"\\testonly\>"
-
-" Freely named Sections {{{1
-syn region rdFreesec matchgroup=Delimiter start="\\section{" matchgroup=Delimiter transparent end=/}/ 
-
-" Rd comments {{{1
-syn match rdComment /%.*$/ contained 
-
-" Error {{{1
-syn region rdRegion matchgroup=Delimiter start=/(/ matchgroup=Delimiter end=/)/ transparent contains=ALLBUT,rdError,rdBraceError,rdCurlyError
-syn region rdRegion matchgroup=Delimiter start=/{/ matchgroup=Delimiter end=/}/ transparent contains=ALLBUT,rdError,rdBraceError,rdParenError
-syn region rdRegion matchgroup=Delimiter start=/\[/ matchgroup=Delimiter end=/]/ transparent contains=ALLBUT,rdError,rdCurlyError,rdParenError
-syn match rdError      /[)\]}]/
-syn match rdBraceError /[)}]/ contained
-syn match rdCurlyError /[)\]]/ contained
-syn match rdParenError /[\]}]/ contained
-
-" Define the default highlighting {{{1
-" 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_rd_syntax_inits")
-  if version < 508
-    let did_rd_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-  HiLink rdIdentifier  Identifier
-  HiLink rdString      String
-  HiLink rdKeyword     Keyword
-  HiLink rdLink        Underlined
-  HiLink rdType	       Type
-  HiLink rdSection     PreCondit
-  HiLink rdError       Error
-  HiLink rdBraceError  Error
-  HiLink rdCurlyError  Error
-  HiLink rdParenError  Error
-  HiLink rdDelimiter   Delimiter
-  HiLink rdComment     Comment
-  HiLink rdRComment    Comment
-  HiLink rdSpecialChar SpecialChar
-  delcommand HiLink
-endif 
-
-let   b:current_syntax = "rd"
-" vim: foldmethod=marker:
diff --git a/runtime/syntax/rhelp.vim b/runtime/syntax/rhelp.vim
new file mode 100644
index 0000000..af86264
--- /dev/null
+++ b/runtime/syntax/rhelp.vim
@@ -0,0 +1,161 @@
+" Vim syntax file
+" Language:    R Help File
+" Maintainer:  Johannes Ranke <jranke@uni-bremen.de>
+" Last Change: 2006 Mär 06
+" Version:     0.5
+" Remarks:     - Now includes R syntax highlighting in the appropriate
+"                sections if an r.vim file is in the same directory or in the
+"                default debian location.
+"              - I didn't yet include any special markup for S4 methods.
+"              - The two versions of \item{}{} markup are not 
+"                distinguished (in the \arguments{} environment, the items to
+"                be described are R identifiers, but not in the \describe{}
+"                environment).
+"              - There is no Latex markup in equations
+
+" Version Clears: {{{1
+" 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")
+  finish
+endif 
+
+syn case match
+
+" Rd identifiers {{{
+syn region rhelpIdentifier matchgroup=rhelpSection	start="\\name{" end="}" 
+syn region rhelpIdentifier matchgroup=rhelpSection	start="\\alias{" end="}" 
+syn region rhelpIdentifier matchgroup=rhelpSection	start="\\pkg{" end="}" 
+syn region rhelpIdentifier matchgroup=rhelpSection	start="\\item{" end="}" contained
+syn region rhelpIdentifier matchgroup=rhelpSection start="\\method{" end=/}/ contained
+
+" Highlighting of R code using an existing r.vim syntax file if available {{{1
+let s:syntaxdir = expand("<sfile>:p:h") "look in the directory of this file
+let s:rsyntax = s:syntaxdir . "/r.vim"
+if filereadable(s:rsyntax)  
+  syn include @R <sfile>:p:h/r.vim
+elseif filereadable('/usr/share/vim/vim64/syntax/r.vim')  "and debian location
+  syn include @R /usr/share/vim/vimcurrent/syntax/r.vim
+else 
+  syn match rhelpRComment /\#.*/				"if no r.vim is found, do comments
+  syn cluster R contains=rhelpRComment 
+endif
+syn region rhelpRcode matchgroup=Delimiter start="\\examples{" matchgroup=Delimiter transparent end=/}/ contains=@R,rhelpSection
+syn region rhelpRcode matchgroup=Delimiter start="\\usage{" matchgroup=Delimiter transparent end=/}/ contains=@R,rhelpIdentifier
+syn region rhelpRcode matchgroup=Delimiter start="\\synopsis{" matchgroup=Delimiter transparent end=/}/ contains=@R
+syn region rhelpRcode matchgroup=Delimiter start="\\special{" matchgroup=Delimiter transparent end=/}/ contains=@R contained
+syn region rhelpRcode matchgroup=Delimiter start="\\code{" matchgroup=Delimiter transparent end=/}/ contains=@R contained
+
+" Strings {{{1
+syn region rhelpString start=/"/ end=/"/ 
+
+" Special TeX characters  ( \$ \& \% \# \{ \} \_) {{{1
+syn match rhelpSpecialChar        "\\[$&%#{}_]"
+
+" Special Delimiters {{{1
+syn match rhelpDelimiter		"\\cr"
+syn match rhelpDelimiter		"\\tab "
+
+" Keywords {{{1
+syn match rhelpKeyword	"\\R"
+syn match rhelpKeyword	"\\dots"
+syn match rhelpKeyword	"\\ldots"
+
+" Links {{{1
+syn region rhelpLink matchgroup=rhelpSection start="\\link{" end="}" contained keepend
+syn region rhelpLink matchgroup=rhelpSection start="\\link\[.*\]{" end="}" contained keepend
+
+" Type Styles {{{1
+syn match rhelpType		"\\emph\>"
+syn match rhelpType		"\\strong\>"
+syn match rhelpType		"\\bold\>"
+syn match rhelpType		"\\sQuote\>"
+syn match rhelpType		"\\dQuote\>"
+syn match rhelpType		"\\preformatted\>"
+syn match rhelpType		"\\kbd\>"
+syn match rhelpType		"\\samp\>"
+syn match rhelpType		"\\eqn\>"
+syn match rhelpType		"\\deqn\>"
+syn match rhelpType		"\\file\>"
+syn match rhelpType		"\\email\>"
+syn match rhelpType		"\\url\>"
+syn match rhelpType		"\\var\>"
+syn match rhelpType		"\\env\>"
+syn match rhelpType		"\\option\>"
+syn match rhelpType		"\\command\>"
+syn match rhelpType		"\\dfn\>"
+syn match rhelpType		"\\cite\>"
+syn match rhelpType		"\\acronym\>"
+
+" rhelp sections {{{1
+syn match rhelpSection		"\\encoding\>"
+syn match rhelpSection		"\\title\>"
+syn match rhelpSection		"\\description\>"
+syn match rhelpSection		"\\concept\>"
+syn match rhelpSection		"\\arguments\>"
+syn match rhelpSection		"\\details\>"
+syn match rhelpSection		"\\value\>"
+syn match rhelpSection		"\\references\>"
+syn match rhelpSection		"\\note\>"
+syn match rhelpSection		"\\author\>"
+syn match rhelpSection		"\\seealso\>"
+syn match rhelpSection		"\\keyword\>"
+syn match rhelpSection		"\\docType\>"
+syn match rhelpSection		"\\format\>"
+syn match rhelpSection		"\\source\>"
+syn match rhelpSection     "\\itemize\>"
+syn match rhelpSection     "\\describe\>"
+syn match rhelpSection     "\\enumerate\>"
+syn match rhelpSection     "\\item "
+syn match rhelpSection     "\\item$"
+syn match rhelpSection		"\\tabular{[lcr]*}"
+syn match rhelpSection		"\\dontrun\>"
+syn match rhelpSection		"\\dontshow\>"
+syn match rhelpSection		"\\testonly\>"
+
+" Freely named Sections {{{1
+syn region rhelpFreesec matchgroup=Delimiter start="\\section{" matchgroup=Delimiter transparent end=/}/ 
+
+" Rd comments {{{1
+syn match rhelpComment /%.*$/ contained 
+
+" Error {{{1
+syn region rhelpRegion matchgroup=Delimiter start=/(/ matchgroup=Delimiter end=/)/ transparent contains=ALLBUT,rhelpError,rhelpBraceError,rhelpCurlyError
+syn region rhelpRegion matchgroup=Delimiter start=/{/ matchgroup=Delimiter end=/}/ transparent contains=ALLBUT,rhelpError,rhelpBraceError,rhelpParenError
+syn region rhelpRegion matchgroup=Delimiter start=/\[/ matchgroup=Delimiter end=/]/ transparent contains=ALLBUT,rhelpError,rhelpCurlyError,rhelpParenError
+syn match rhelpError      /[)\]}]/
+syn match rhelpBraceError /[)}]/ contained
+syn match rhelpCurlyError /[)\]]/ contained
+syn match rhelpParenError /[\]}]/ contained
+
+" Define the default highlighting {{{1
+" 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_rhelp_syntax_inits")
+  if version < 508
+    let did_rhelp_syntax_inits = 1
+    command -nargs=+ HiLink hi link <args>
+  else
+    command -nargs=+ HiLink hi def link <args>
+  endif
+  HiLink rhelpIdentifier  Identifier
+  HiLink rhelpString      String
+  HiLink rhelpKeyword     Keyword
+  HiLink rhelpLink        Underlined
+  HiLink rhelpType	       Type
+  HiLink rhelpSection     PreCondit
+  HiLink rhelpError       Error
+  HiLink rhelpBraceError  Error
+  HiLink rhelpCurlyError  Error
+  HiLink rhelpParenError  Error
+  HiLink rhelpDelimiter   Delimiter
+  HiLink rhelpComment     Comment
+  HiLink rhelpRComment    Comment
+  HiLink rhelpSpecialChar SpecialChar
+  delcommand HiLink
+endif 
+
+let   b:current_syntax = "rhelp"
+" vim: foldmethod=marker:
diff --git a/runtime/syntax/sshconfig.vim b/runtime/syntax/sshconfig.vim
index c2da72a..44f23d7 100644
--- a/runtime/syntax/sshconfig.vim
+++ b/runtime/syntax/sshconfig.vim
@@ -2,7 +2,7 @@
 " This is a GENERATED FILE. Please always refer to source file at the URI below.
 " Language: OpenSSH server configuration file (ssh_config)
 " Maintainer: David Ne\v{c}as (Yeti) <yeti@physics.muni.cz>
-" Last Change: 2003-05-06
+" Last Change: 2006-03-05
 " URL: http://trific.ath.cx/Ftp/vim/syntax/sshconfig.vim
 
 " Setup
@@ -30,7 +30,8 @@
 syn keyword sshconfigYesNo yes no ask
 syn keyword sshconfigCipher blowfish des 3des
 syn keyword sshconfigCipher aes128-cbc 3des-cbc blowfish-cbc cast128-cbc
-syn keyword sshconfigCipher arcfour aes192-cbc aes256-cbc
+syn keyword sshconfigCipher aes192-cbc aes256-cbc aes128-ctr aes256-ctr
+syn keyword sshconfigCipher arcfour arcfour128 arcfour256 cast128-cbc
 syn keyword sshconfigMAC hmac-md5 hmac-sha1 hmac-ripemd160 hmac-sha1-96
 syn keyword sshconfigMAC hmac-md5-96
 syn keyword sshconfigHostKeyAlg ssh-rsa ssh-dss
@@ -48,24 +49,29 @@
 
 " Keywords
 syn keyword sshconfigHostSect Host
-syn keyword sshconfigKeyword AFSTokenPassing BatchMode BindAddress
+syn keyword sshconfigKeyword AddressFamily BatchMode BindAddress
 syn keyword sshconfigKeyword ChallengeResponseAuthentication CheckHostIP
-syn keyword sshconfigKeyword Cipher Ciphers ClearAllForwardings Compression
-syn keyword sshconfigKeyword CompressionLevel ConnectionAttempts
-syn keyword sshconfigKeyword DynamicForward EscapeChar ForwardAgent ForwardX11
-syn keyword sshconfigKeyword GatewayPorts GlobalKnownHostsFile
-syn keyword sshconfigKeyword HostbasedAuthentication HostKeyAlgorithms
-syn keyword sshconfigKeyword HostKeyAlias HostName IdentityFile KeepAlive
-syn keyword sshconfigKeyword KerberosAuthentication KerberosTgtPassing
-syn keyword sshconfigKeyword LocalForward LogLevel MACs
-syn keyword sshconfigKeyword NoHostAuthenticationForLocalhost
+syn keyword sshconfigKeyword Cipher Ciphers ClearAllForwardings
+syn keyword sshconfigKeyword Compression CompressionLevel ConnectTimeout
+syn keyword sshconfigKeyword ConnectionAttempts ControlMaster
+syn keyword sshconfigKeyword ControlPath DynamicForward EnableSSHKeysign
+syn keyword sshconfigKeyword EscapeChar ForwardAgent ForwardX11
+syn keyword sshconfigKeyword ForwardX11Trusted GSSAPIAuthentication
+syn keyword sshconfigKeyword GSSAPIDelegateCredentials GatewayPorts
+syn keyword sshconfigKeyword GlobalKnownHostsFile HostKeyAlgorithms
+syn keyword sshconfigKeyword HashKnownHosts KbdInteractiveDevices
+syn keyword sshconfigKeyword HostKeyAlias HostName HostbasedAuthentication
+syn keyword sshconfigKeyword IdentitiesOnly IdentityFile LocalForward
+syn keyword sshconfigKeyword LogLevel MACs NoHostAuthenticationForLocalhost
 syn keyword sshconfigKeyword NumberOfPasswordPrompts PasswordAuthentication
 syn keyword sshconfigKeyword Port PreferredAuthentications Protocol
-syn keyword sshconfigKeyword ProxyCommand PubkeyAuthentication RemoteForward
+syn keyword sshconfigKeyword ProxyCommand PubkeyAuthentication
+syn keyword sshconfigKeyword RSAAuthentication RemoteForward
 syn keyword sshconfigKeyword RhostsAuthentication RhostsRSAAuthentication
-syn keyword sshconfigKeyword RSAAuthentication SmartcardDevice
-syn keyword sshconfigKeyword StrictHostKeyChecking UsePrivilegedPort User
-syn keyword sshconfigKeyword UserKnownHostsFile XAuthLocation
+syn keyword sshconfigKeyword SendEnv ServerAliveCountMax ServerAliveInterval
+syn keyword sshconfigKeyword SmartcardDevice StrictHostKeyChecking
+syn keyword sshconfigKeyword TCPKeepAlive UsePrivilegedPort User
+syn keyword sshconfigKeyword UserKnownHostsFile VerifyHostKeyDNS XAuthLocation
 
 " Define the default highlighting
 if version >= 508 || !exists("did_sshconfig_syntax_inits")
diff --git a/runtime/syntax/sshdconfig.vim b/runtime/syntax/sshdconfig.vim
index c334304..2217e09 100644
--- a/runtime/syntax/sshdconfig.vim
+++ b/runtime/syntax/sshdconfig.vim
@@ -2,7 +2,7 @@
 " This is a GENERATED FILE. Please always refer to source file at the URI below.
 " Language: OpenSSH server configuration file (sshd_config)
 " Maintainer: David Ne\v{c}as (Yeti) <yeti@physics.muni.cz>
-" Last Change: 2003-05-06
+" Last Change: 2006-03-05
 " URL: http://trific.ath.cx/Ftp/vim/syntax/sshdconfig.vim
 
 " Setup
@@ -29,8 +29,8 @@
 " Constants
 syn keyword sshdconfigYesNo yes no
 syn keyword sshdconfigCipher aes128-cbc 3des-cbc blowfish-cbc cast128-cbc
-syn keyword sshdconfigCipher aes192-cbc aes256-cbc
-syn keyword sshdconfigCipher arcfour
+syn keyword sshdconfigCipher aes192-cbc aes256-cbc aes128-ctr aes256-ctr
+syn keyword sshdconfigCipher arcfour arcfour128 arcfour256 cast128-cbc
 syn keyword sshdconfigMAC hmac-md5 hmac-sha1 hmac-ripemd160 hmac-sha1-96
 syn keyword sshdconfigMAC hmac-md5-96
 syn keyword sshdconfigRootLogin without-password forced-commands-only
@@ -46,27 +46,33 @@
 syn match sshdconfigTime "\<\(\d\+[sSmMhHdDwW]\)\+\>"
 
 " Keywords
-syn keyword sshdconfigKeyword AFSTokenPassing AllowGroups AllowTcpForwarding
+syn keyword sshdconfigKeyword AcceptEnv AddressFamily
+syn keyword sshdconfigKeyword AllowGroups AllowTcpForwarding
 syn keyword sshdconfigKeyword AllowUsers AuthorizedKeysFile Banner
-syn keyword sshdconfigKeyword ChallengeResponseAuthentication Ciphers
-syn keyword sshdconfigKeyword ClientAliveInterval ClientAliveCountMax
-syn keyword sshdconfigKeyword Compression DenyGroups DenyUsers GatewayPorts
-syn keyword sshdconfigKeyword HostbasedAuthentication HostKey IgnoreRhosts
-syn keyword sshdconfigKeyword IgnoreUserKnownHosts KeepAlive
+syn keyword sshdconfigKeyword ChallengeResponseAuthentication
+syn keyword sshdconfigKeyword Ciphers ClientAliveCountMax
+syn keyword sshdconfigKeyword ClientAliveInterval Compression
+syn keyword sshdconfigKeyword DenyGroups DenyUsers GSSAPIAuthentication
+syn keyword sshdconfigKeyword GSSAPICleanupCredentials GatewayPorts
+syn keyword sshdconfigKeyword HostKey HostbasedAuthentication
+syn keyword sshdconfigKeyword IgnoreRhosts IgnoreUserKnownHosts
 syn keyword sshdconfigKeyword KerberosAuthentication KerberosOrLocalPasswd
 syn keyword sshdconfigKeyword KerberosTgtPassing KerberosTicketCleanup
+syn keyword sshdconfigKeyword KerberosGetAFSToken
 syn keyword sshdconfigKeyword KeyRegenerationInterval ListenAddress
-syn keyword sshdconfigKeyword LoginGraceTime LogLevel MACs MaxStartups
-syn keyword sshdconfigKeyword PAMAuthenticationViaKbdInt
-syn keyword sshdconfigKeyword PasswordAuthentication PermitEmptyPasswords
-syn keyword sshdconfigKeyword PermitRootLogin PermitUserEnvironment PidFile
-syn keyword sshdconfigKeyword Port PrintLastLog PrintMotd Protocol
-syn keyword sshdconfigKeyword PubkeyAuthentication RhostsAuthentication
-syn keyword sshdconfigKeyword RhostsRSAAuthentication RSAAuthentication
+syn keyword sshdconfigKeyword LogLevel LoginGraceTime MACs MaxAuthTries
+syn keyword sshdconfigKeyword MaxStartups PasswordAuthentication
+syn keyword sshdconfigKeyword PermitEmptyPasswords PermitRootLogin
+syn keyword sshdconfigKeyword PermitUserEnvironment PidFile Port
+syn keyword sshdconfigKeyword PrintLastLog PrintMotd Protocol
+syn keyword sshdconfigKeyword PubkeyAuthentication RSAAuthentication
+syn keyword sshdconfigKeyword RhostsAuthentication RhostsRSAAuthentication
 syn keyword sshdconfigKeyword ServerKeyBits StrictModes Subsystem
-syn keyword sshdconfigKeyword SyslogFacility UseLogin UsePrivilegeSeparation
-syn keyword sshdconfigKeyword VerifyReverseMapping X11DisplayOffset
-syn keyword sshdconfigKeyword X11Forwarding X11UseLocalhost XAuthLocation
+syn keyword sshdconfigKeyword ShowPatchLevel
+syn keyword sshdconfigKeyword SyslogFacility TCPKeepAlive UseDNS
+syn keyword sshdconfigKeyword UseLogin UsePAM UsePrivilegeSeparation
+syn keyword sshdconfigKeyword X11DisplayOffset X11Forwarding
+syn keyword sshdconfigKeyword X11UseLocalhost XAuthLocation
 
 " Define the default highlighting
 if version >= 508 || !exists("did_sshdconfig_syntax_inits")