diff --git a/doc/Xinput.xml b/doc/Xinput.xml
index 0a7ec8dc0..7f576a135 100644
--- a/doc/Xinput.xml
+++ b/doc/Xinput.xml
@@ -15,7 +15,7 @@
          <affiliation><orgname>Hewlett-Packard</orgname></affiliation>
       </author>
    </authorgroup>
-   <releaseinfo>X server version &xserver.version;</releaseinfo>
+   <releaseinfo>X Server Version &xserver.version;</releaseinfo>
    <copyright><year>1989</year><year>1990</year><year>1991</year>
      <holder>Hewlett-Packard Company</holder>
    </copyright>
diff --git a/doc/Xserver-spec.xml b/doc/Xserver-spec.xml
index 2bf4fb3b7..5c481c917 100644
--- a/doc/Xserver-spec.xml
+++ b/doc/Xserver-spec.xml
@@ -43,7 +43,7 @@
     </author>
     <publisher><publishername>The X.Org Foundation</publishername></publisher>
     <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo>
-    <releaseinfo>X server version &xserver.version;</releaseinfo>
+    <releaseinfo>X Server Version &xserver.version;</releaseinfo>
     <copyright><year>1994</year><holder>X Consortium, Inc.</holder></copyright>
     <copyright><year>2004</year><holder>X.org Foundation, Inc.</holder></copyright>
     <legalnotice>
diff --git a/doc/dtrace/Xserver-DTrace.xml b/doc/dtrace/Xserver-DTrace.xml
index fa8bc809a..5ef062980 100644
--- a/doc/dtrace/Xserver-DTrace.xml
+++ b/doc/dtrace/Xserver-DTrace.xml
@@ -14,7 +14,7 @@
 	<orgdiv>Solaris Engineering</orgdiv>
       </affiliation>
     </author>
-    <releaseinfo>X.Org Xserver version &xserver.version;</releaseinfo>
+    <releaseinfo>X Server Version &xserver.version;</releaseinfo>
     <copyright><year>2005</year><year>2006</year><year>2007</year><year>2010</year>
       <holder>Oracle and/or its affiliates. All rights reserved.</holder>
     </copyright>
diff --git a/hw/dmx/doc/dmx.xml b/hw/dmx/doc/dmx.xml
index 845eec97a..793aacea0 100644
--- a/hw/dmx/doc/dmx.xml
+++ b/hw/dmx/doc/dmx.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
  "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+ <!ENTITY % defs SYSTEM "/xserver/doc/xml/xserver.ent"> %defs;
 ]>
 
 <article>
@@ -14,6 +15,7 @@
       <author><firstname>Rickard E.</firstname><surname>Faith</surname></author>
     </authorgroup>
     <pubdate>29 June 2004 (created 25 July 2001)</pubdate>
+    <releaseinfo>X Server Version &xserver.version;</releaseinfo>
     <abstract><para>
         This document covers the motivation, background, design, and
         implementation of the distributed multihead X (DMX) system.  It
diff --git a/hw/dmx/doc/scaled.xml b/hw/dmx/doc/scaled.xml
index 48c83e076..30c9b9f50 100644
--- a/hw/dmx/doc/scaled.xml
+++ b/hw/dmx/doc/scaled.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
  "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+ <!ENTITY % defs SYSTEM "/xserver/doc/xml/xserver.ent"> %defs;
 ]>
   <article>
 
@@ -12,6 +13,7 @@
       <author><firstname>Rickard E.</firstname><surname>Faith</surname></author>
     </authorgroup>
     <pubdate>15 October 2003 (created 19 September 2003)</pubdate>
+    <releaseinfo>X Server Version &xserver.version;</releaseinfo>
     <abstract>
       <para>
       This document investigates the possibility of adding scaled window
diff --git a/hw/xfree86/doc/ddxDesign.xml b/hw/xfree86/doc/ddxDesign.xml
index c406cd744..a1212a629 100644
--- a/hw/xfree86/doc/ddxDesign.xml
+++ b/hw/xfree86/doc/ddxDesign.xml
@@ -34,7 +34,7 @@
 
     <pubdate>&xserver.reldate;</pubdate>
     <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo>
-    <releaseinfo>Xorg server version &xserver.version;</releaseinfo>
+    <releaseinfo>X Server Version &xserver.version;</releaseinfo>
 
   </articleinfo>