--- ftdetect/gentoo.vim.old	2006-09-02 15:01:04.000000000 +0200
+++ ftdetect/gentoo.vim	2006-09-02 15:19:22.000000000 +0200
@@ -77,18 +77,18 @@
 " metadata.xml
 au BufNewFile,BufRead metadata.xml
     \     set filetype=gentoo-metadata
 
 " guidexml
 au BufNewFile,BufRead *.xml
-    \     if getline(1) =~ "<!DOCTYPE \\(guide\\|book\\|sections\\) " ||
-    \        getline(2) =~ "<!DOCTYPE \\(guide\\|book\\|sections\\) " ||
-    \        getline(3) =~ "<!DOCTYPE \\(guide\\|book\\|sections\\) " ||
-    \        getline(4) =~ "<!DOCTYPE \\(guide\\|book\\|sections\\) " ||
-    \        getline(5) =~ "<!DOCTYPE \\(guide\\|book\\|sections\\) " ||
-    \        getline(6) =~ "<!DOCTYPE \\(guide\\|book\\|sections\\) " ||
-    \        getline(7) =~ "<!DOCTYPE \\(guide\\|book\\|sections\\) " ||
-    \        getline(8) =~ "<!DOCTYPE \\(guide\\|book\\|sections\\) " ||
-    \        getline(9) =~ "<!DOCTYPE \\(guide\\|book\\|sections\\) " |
+    \     if getline(1) =~ "<!DOCTYPE \\(guide\\|news\\|mainpage\\|book\\|sections\\|dynamic\\|inserts\\) " ||
+    \        getline(2) =~ "<!DOCTYPE \\(guide\\|news\\|mainpage\\|book\\|sections\\|dynamic\\|inserts\\) " ||
+    \        getline(3) =~ "<!DOCTYPE \\(guide\\|news\\|mainpage\\|book\\|sections\\|dynamic\\|inserts\\) " ||
+    \        getline(4) =~ "<!DOCTYPE \\(guide\\|news\\|mainpage\\|book\\|sections\\|dynamic\\|inserts\\) " ||
+    \        getline(5) =~ "<!DOCTYPE \\(guide\\|news\\|mainpage\\|book\\|sections\\|dynamic\\|inserts\\) " ||
+    \        getline(6) =~ "<!DOCTYPE \\(guide\\|news\\|mainpage\\|book\\|sections\\|dynamic\\|inserts\\) " ||
+    \        getline(7) =~ "<!DOCTYPE \\(guide\\|news\\|mainpage\\|book\\|sections\\|dynamic\\|inserts\\) " ||
+    \        getline(8) =~ "<!DOCTYPE \\(guide\\|news\\|mainpage\\|book\\|sections\\|dynamic\\|inserts\\) " ||
+    \        getline(9) =~ "<!DOCTYPE \\(guide\\|news\\|mainpage\\|book\\|sections\\|dynamic\\|inserts\\) " |
     \     set filetype=guidexml		      |
     \	 endif
 
--- syntax/guidexml.vim.old	2006-09-02 14:11:51.000000000 +0200
+++ syntax/guidexml.vim	2006-09-02 15:23:52.000000000 +0200
@@ -21,22 +21,29 @@
 syn cluster xmlTagHook add=guidexmlElement
 syn keyword guidexmlElement contained mainpage guide news title subtitle
 syn keyword guidexmlElement contained poster author abstract summary license
 syn keyword guidexmlElement contained glsaindex glsa-latest version date
 syn keyword guidexmlElement contained chapter section body figure fig img
 syn keyword guidexmlElement contained br note impo warn pre p table tcolumn
-syn keyword guidexmlElement contained tr th ti ul ol li b brite box c comment
-syn keyword guidexmlElement contained e i path mail uri
+syn keyword guidexmlElement contained tr th ti ul ol li b brite c comment
+syn keyword guidexmlElement contained e i path mail uri dl dt dd newsitem
+syn keyword guidexmlElement contained sup sub keyword ident const stmt var
 syn keyword guidexmlElement contained book part include sections subsection
+syn keyword guidexmlElement contained keyval values key
+syn keyword guidexmlElement contained metadoc members lead member categories
+syn keyword guidexmlElement contained cat files file docs doc memberof fileid
+syn keyword guidexmlElement contained bugs bug dynamic intro listing list catid
+syn keyword guidexmlElement contained overview inserts insert docdate
 
 syn cluster xmlAttribHook add=guidexmlAttr
-syn match guidexmlAttr contained /about\|articles\|author\|caption\|category\|changelog/
-syn match guidexmlAttr contained /contract\|docs\|gentoo\|graphics\|id\|irc\|lang\|link/
-syn match guidexmlAttr contained /linkto\|lists\|news\|newsletter\|packages\|performace/
-syn match guidexmlAttr contained /projects\|short\|shots\|sponsors\|src\|support\|title/
-syn match guidexmlAttr contained /type\|where\|width\|href/
+syn match guidexmlAttr contained /author\|caption\|category\|test\|parent/
+syn match guidexmlAttr contained /gentoo\|id\|lang\|by\|linkto\|link/
+syn match guidexmlAttr contained /short\|src\|title\|colspan\|rowspan/
+syn match guidexmlAttr contained /type\|disclaimer\|redirect\|width\|align/
+syn match guidexmlAttr contained /mail\|fullname\|vpart\|vchap\|stopper\|arch/
+syn match guidexmlAttr contained /href\|metadoc\|name/
 
 hi def link guidexmlElement Keyword
 hi def link guidexmlAttr    Keyword
 
 let b:current_syntax = "guidexml"