diff --git a/lib/modules/Tools.pmod/AutoDoc.pmod/DocParser.pmod b/lib/modules/Tools.pmod/AutoDoc.pmod/DocParser.pmod
index 4f8549ecfd4e53fd257ed9a69f34b34426ec0236..73c5baa3d841ddfbbd3c5743a86dd3054f24211a 100644
--- a/lib/modules/Tools.pmod/AutoDoc.pmod/DocParser.pmod
+++ b/lib/modules/Tools.pmod/AutoDoc.pmod/DocParser.pmod
@@ -51,21 +51,21 @@ mapping(string : int) keywordtype =
   "pre" : BRACEKEYWORD,
   "ref" : BRACEKEYWORD,
   "xml" : BRACEKEYWORD,  // well, not really, but....
-  "code" : BRACEKEYWORD,
   "expr" : BRACEKEYWORD,
   "image" : BRACEKEYWORD,
 
   "deprecated" : SINGLEKEYWORD,
 
+  "bugs" : DELIMITERKEYWORD,
   "example" : DELIMITERKEYWORD,
+  "fixme" : DELIMITERKEYWORD,
   "note" : DELIMITERKEYWORD,
-  "bugs" : DELIMITERKEYWORD,
-  "returns" : DELIMITERKEYWORD,
-  "throws" : DELIMITERKEYWORD,
   "param" : DELIMITERKEYWORD,
+  "returns" : DELIMITERKEYWORD,
   "seealso" : DELIMITERKEYWORD,
-  "fixme" : DELIMITERKEYWORD,
+  "throws" : DELIMITERKEYWORD,
 
+  "code" : CONTAINERKEYWORD,
   "section" : CONTAINERKEYWORD,
 
   "constant" : DELIMITERKEYWORD, // used inside @decl enum Foo
@@ -103,7 +103,7 @@ mapping(string:array(string)) required_attributes =
 ]);  
 
 static constant standard = (<
-  "note", "bugs", "example", "seealso", "deprecated", "fixme"
+  "note", "bugs", "example", "seealso", "deprecated", "fixme", "code"
 >);
 
 mapping(string : multiset(string)) allowedChildren =