diff --git a/xdoc/src/dtd/maven-xdoc.dtd b/xdoc/src/dtd/maven-xdoc.dtd
index 27ebf550..98865302 100644
--- a/xdoc/src/dtd/maven-xdoc.dtd
+++ b/xdoc/src/dtd/maven-xdoc.dtd
@@ -239,9 +239,11 @@
 <!ENTITY % block
     "p | %heading; | div | source | %lists; | %blocktext; | isindex |fieldset | table">
 
-<!ENTITY % block.section "(%block; | escapeXml | subsection)*">
-<!ENTITY % block.subsection "(%block; | escapeXml)*">
-
+<!ENTITY % block.section "(#PCDATA | %block; | form | %inline; | %misc; | escapeXml | subsection)*">
+<!ENTITY % block.subsection "(#PCDATA | %block; | form | %inline; | %misc; | escapeXml)*">
+<!ENTITY % block.source
+   "(#PCDATA | a | %special.basic; | %fontstyle.basic; | %phrase.basic; |
+       %inline.forms; | %misc.inline; | escapeXml)*">
 
 <!-- %Flow; mixes block and inline and is used for list items etc. -->
 <!ENTITY % Flow "(#PCDATA | %block; | form | %inline; | %misc;)*">
@@ -1205,16 +1207,16 @@ several semantically related columns together.
 <!--======================= Xdoc Specific =======================================-->
 
 <!ELEMENT escapeXml ANY>
-<!ELEMENT source (#PCDATA | escapeXml)*>
+<!ELEMENT source %block.source;>
 
-<!ELEMENT section (%block.section;)*>
+<!ELEMENT section %block.section;>
 <!ATTLIST section
   %attrs;
   %TextAlign;
   name CDATA #REQUIRED
 >
 
-<!ELEMENT subsection (%block.subsection;)*>
+<!ELEMENT subsection %block.subsection;>
 <!ATTLIST subsection
   %attrs;
   %TextAlign;
diff --git a/xdoc/src/plugin-resources/dtd/maven-xdoc-1.10.dtd b/xdoc/src/plugin-resources/dtd/maven-xdoc-1.10.dtd
index 27ebf550..98865302 100644
--- a/xdoc/src/plugin-resources/dtd/maven-xdoc-1.10.dtd
+++ b/xdoc/src/plugin-resources/dtd/maven-xdoc-1.10.dtd
@@ -239,9 +239,11 @@
 <!ENTITY % block
     "p | %heading; | div | source | %lists; | %blocktext; | isindex |fieldset | table">
 
-<!ENTITY % block.section "(%block; | escapeXml | subsection)*">
-<!ENTITY % block.subsection "(%block; | escapeXml)*">
-
+<!ENTITY % block.section "(#PCDATA | %block; | form | %inline; | %misc; | escapeXml | subsection)*">
+<!ENTITY % block.subsection "(#PCDATA | %block; | form | %inline; | %misc; | escapeXml)*">
+<!ENTITY % block.source
+   "(#PCDATA | a | %special.basic; | %fontstyle.basic; | %phrase.basic; |
+       %inline.forms; | %misc.inline; | escapeXml)*">
 
 <!-- %Flow; mixes block and inline and is used for list items etc. -->
 <!ENTITY % Flow "(#PCDATA | %block; | form | %inline; | %misc;)*">
@@ -1205,16 +1207,16 @@ several semantically related columns together.
 <!--======================= Xdoc Specific =======================================-->
 
 <!ELEMENT escapeXml ANY>
-<!ELEMENT source (#PCDATA | escapeXml)*>
+<!ELEMENT source %block.source;>
 
-<!ELEMENT section (%block.section;)*>
+<!ELEMENT section %block.section;>
 <!ATTLIST section
   %attrs;
   %TextAlign;
   name CDATA #REQUIRED
 >
 
-<!ELEMENT subsection (%block.subsection;)*>
+<!ELEMENT subsection %block.subsection;>
 <!ATTLIST subsection
   %attrs;
   %TextAlign;