diff --git a/runtime/syntax/dnsmasq.vim b/runtime/syntax/dnsmasq.vim
index 39f106c..8f3fe3f 100644
--- a/runtime/syntax/dnsmasq.vim
+++ b/runtime/syntax/dnsmasq.vim
@@ -1,9 +1,11 @@
 " Vim syntax file
-" Language:	dnsmasq(8) configuration file
+" Language:	dnsmasq configuration file
 " Maintainer:	Thilo Six <T.Six@gmx.de>
-" Last Change:	2011 Jul 14
-" Credits:	This file is a mix of cfg.vim, wget.vim and xf86conf.vim, credits go to:
-"		Igor N. Prischepoff
+" Version:	2.59-1
+" Last Change:	2011 Dec 11
+" Modeline:	vim: ts=8:sw=2:sts=2:
+"
+" Credits:	Igor N. Prischepoff
 "		Doug Kearns
 "		David Ne\v{c}as
 "
@@ -16,15 +18,20 @@
 "		    let dnsmasq_backrgound_light = 1
 "		endif
 "
+"
 
 " 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")
+elseif exists("b:current_syntax") || &compatible
     finish
 endif
 
+" predictable environment:
+let s:keepcpo = &cpo
+set cpo&vim
+
 
 if !exists("b:dnsmasq_backrgound_light")
 	if exists("dnsmasq_backrgound_light")
@@ -60,13 +67,20 @@
 
 syn keyword DnsmasqTodo	    FIXME TODO XXX NOTE contained
 
+" highlight trailing spaces
+syn match   DnsmasqTrailSpace	   "[ \t]\+$"
+syn match   DnsmasqTrailSpace	   "[ \t]\+$" containedin=ALL
+
 syn match DnsmasqKeywordSpecial    "\<set\>:"me=e-1
 syn match DnsmasqKeywordSpecial    "\<tag\>:"me=e-1
 syn match DnsmasqKeywordSpecial    ",\<static\>"hs=s+1	  contains=DnsmasqSpecial
 syn match DnsmasqKeywordSpecial    ",\<infinite\>"hs=s+1  contains=DnsmasqSpecial
 syn match DnsmasqKeywordSpecial    "\<encap\>:"me=e-1
+syn match DnsmasqKeywordSpecial    "\<interface\>:"me=e-1
+syn match DnsmasqKeywordSpecial    "\<vi-encap\>:"me=e-1
 syn match DnsmasqKeywordSpecial    "\<net\>:"me=e-1
 syn match DnsmasqKeywordSpecial    "\<vendor\>:"me=e-1
+syn match DnsmasqKeywordSpecial    "\<opt\>:"me=e-1
 syn match DnsmasqKeywordSpecial    "\<option\>:"me=e-1
 syn match DnsmasqKeywordSpecial    ",\<ignore\>"hs=s+1	  contains=DnsmasqSpecial
 syn match DnsmasqKeywordSpecial    "\<id\>:"me=e-1
@@ -79,30 +93,46 @@
 syn match DnsmasqKeyword    "^\s*bind-interfaces\>"
 syn match DnsmasqKeyword    "^\s*bogus-nxdomain\>"
 syn match DnsmasqKeyword    "^\s*bogus-priv\>"
+syn match DnsmasqKeyword    "^\s*bootp-dynamic\>"
+syn match DnsmasqKeyword    "^\s*bridge-interface\>"
 syn match DnsmasqKeyword    "^\s*cache-size\>"
 syn match DnsmasqKeyword    "^\s*clear-on-reload\>"
 syn match DnsmasqKeyword    "^\s*cname\>"
 syn match DnsmasqKeyword    "^\s*conf-dir\>"
 syn match DnsmasqKeyword    "^\s*conf-file\>"
+syn match DnsmasqKeyword    "^\s*conntrack\>"
+syn match DnsmasqKeyword    "^\s*dhcp-alternate-port\>"
 syn match DnsmasqKeyword    "^\s*dhcp-authoritative\>"
 syn match DnsmasqKeyword    "^\s*dhcp-boot\>"
+syn match DnsmasqKeyword    "^\s*dhcp-broadcast\>"
+syn match DnsmasqKeyword    "^\s*dhcp-circuitid\>"
 syn match DnsmasqKeyword    "^\s*dhcp-fqdn\>"
+syn match DnsmasqKeyword    "^\s*dhcp-generate-names\>"
 syn match DnsmasqKeyword    "^\s*dhcp-host\>"
+syn match DnsmasqKeyword    "^\s*dhcp-hostsfile\>"
 syn match DnsmasqKeyword    "^\s*dhcp-ignore\>"
+syn match DnsmasqKeyword    "^\s*dhcp-ignore-names\>"
 syn match DnsmasqKeyword    "^\s*dhcp-lease-max\>"
 syn match DnsmasqKeyword    "^\s*dhcp-leasefile\>"
 syn match DnsmasqKeyword    "^\s*dhcp-mac\>"
 syn match DnsmasqKeyword    "^\s*dhcp-match\>"
 syn match DnsmasqKeyword    "^\s*dhcp-no-override\>"
-syn match DnsmasqKeyword    "^\s*dhcp-option-force\>"
 syn match DnsmasqKeyword    "^\s*dhcp-option\>"
+syn match DnsmasqKeyword    "^\s*dhcp-option-force\>"
+syn match DnsmasqKeyword    "^\s*dhcp-optsfile\>"
+syn match DnsmasqKeyword    "^\s*dhcp-proxy\>"
 syn match DnsmasqKeyword    "^\s*dhcp-range\>"
+syn match DnsmasqKeyword    "^\s*dhcp-remoteid\>"
 syn match DnsmasqKeyword    "^\s*dhcp-script\>"
 syn match DnsmasqKeyword    "^\s*dhcp-scriptuser\>"
+syn match DnsmasqKeyword    "^\s*dhcp-sequential-ip\>"
+syn match DnsmasqKeyword    "^\s*dhcp-subscrid\>"
 syn match DnsmasqKeyword    "^\s*dhcp-userclass\>"
 syn match DnsmasqKeyword    "^\s*dhcp-vendorclass\>"
-syn match DnsmasqKeyword    "^\s*domain-needed\>"
+syn match DnsmasqKeyword    "^\s*dns-forward-max\>"
 syn match DnsmasqKeyword    "^\s*domain\>"
+syn match DnsmasqKeyword    "^\s*domain-needed\>"
+syn match DnsmasqKeyword    "^\s*edns-packet-max\>"
 syn match DnsmasqKeyword    "^\s*enable-dbus\>"
 syn match DnsmasqKeyword    "^\s*enable-tftp\>"
 syn match DnsmasqKeyword    "^\s*except-interface\>"
@@ -110,17 +140,24 @@
 syn match DnsmasqKeyword    "^\s*filterwin2k\>"
 syn match DnsmasqKeyword    "^\s*group\>"
 syn match DnsmasqKeyword    "^\s*interface\>"
+syn match DnsmasqKeyword    "^\s*interface-name\>"
 syn match DnsmasqKeyword    "^\s*keep-in-foreground\>"
 syn match DnsmasqKeyword    "^\s*leasefile-ro\>"
 syn match DnsmasqKeyword    "^\s*listen-address\>"
-syn match DnsmasqKeyword    "^\s*local-ttl\>"
 syn match DnsmasqKeyword    "^\s*local\>"
+syn match DnsmasqKeyword    "^\s*local-ttl\>"
 syn match DnsmasqKeyword    "^\s*localise-queries\>"
 syn match DnsmasqKeyword    "^\s*localmx\>"
+syn match DnsmasqKeyword    "^\s*log-async\>"
 syn match DnsmasqKeyword    "^\s*log-dhcp\>"
+syn match DnsmasqKeyword    "^\s*log-facility\>"
 syn match DnsmasqKeyword    "^\s*log-queries\>"
+syn match DnsmasqKeyword    "^\s*max-ttl\>"
+syn match DnsmasqKeyword    "^\s*min-port\>"
 syn match DnsmasqKeyword    "^\s*mx-host\>"
 syn match DnsmasqKeyword    "^\s*mx-target\>"
+syn match DnsmasqKeyword    "^\s*naptr-record\>"
+syn match DnsmasqKeyword    "^\s*neg-ttl\>"
 syn match DnsmasqKeyword    "^\s*no-daemon\>"
 syn match DnsmasqKeyword    "^\s*no-dhcp-interface\>"
 syn match DnsmasqKeyword    "^\s*no-hosts\>"
@@ -128,11 +165,15 @@
 syn match DnsmasqKeyword    "^\s*no-ping\>"
 syn match DnsmasqKeyword    "^\s*no-poll\>"
 syn match DnsmasqKeyword    "^\s*no-resolv\>"
+syn match DnsmasqKeyword    "^\s*pid-file\>"
+syn match DnsmasqKeyword    "^\s*port\>"
 syn match DnsmasqKeyword    "^\s*proxy-dnssec\>"
 syn match DnsmasqKeyword    "^\s*ptr-record\>"
 syn match DnsmasqKeyword    "^\s*pxe-prompt\>"
 syn match DnsmasqKeyword    "^\s*pxe-service\>"
+syn match DnsmasqKeyword    "^\s*query-port\>"
 syn match DnsmasqKeyword    "^\s*read-ethers\>"
+syn match DnsmasqKeyword    "^\s*rebind-domain-ok\>"
 syn match DnsmasqKeyword    "^\s*rebind-localhost-ok\>"
 syn match DnsmasqKeyword    "^\s*resolv-file\>"
 syn match DnsmasqKeyword    "^\s*selfmx\>"
@@ -140,12 +181,17 @@
 syn match DnsmasqKeyword    "^\s*srv-host\>"
 syn match DnsmasqKeyword    "^\s*stop-dns-rebind\>"
 syn match DnsmasqKeyword    "^\s*strict-order\>"
+syn match DnsmasqKeyword    "^\s*tag-if\>"
+syn match DnsmasqKeyword    "^\s*test\>"
+syn match DnsmasqKeyword    "^\s*tftp-max\>"
 syn match DnsmasqKeyword    "^\s*tftp-no-blocksize\>"
+syn match DnsmasqKeyword    "^\s*tftp-port-range\>"
 syn match DnsmasqKeyword    "^\s*tftp-root\>"
 syn match DnsmasqKeyword    "^\s*tftp-secure\>"
 syn match DnsmasqKeyword    "^\s*tftp-unique-root\>"
 syn match DnsmasqKeyword    "^\s*txt-record\>"
 syn match DnsmasqKeyword    "^\s*user\>"
+syn match DnsmasqKeyword    "^\s*version\>"
 
 
 if b:dnsmasq_backrgound_light == 1
@@ -165,9 +211,12 @@
 hi def link DnsmasqMac		Preproc
 hi def link DnsmasqTime		Preproc
 hi def link DnsmasqComment	Comment
+hi def link DnsmasqTrailSpace	DiffDelete
 hi def link DnsmasqString	Constant
 hi def link DnsmasqValues	Normal
 
-
 let b:current_syntax = "dnsmasq"
 
+let &cpo = s:keepcpo
+unlet s:keepcpo
+