diff --git a/specs/libX11/AppD.xml b/specs/libX11/AppD.xml
index f3c0e2f6..fdea4689 100644
--- a/specs/libX11/AppD.xml
+++ b/specs/libX11/AppD.xml
@@ -361,7 +361,7 @@ The next two functions set and read the <property>WM_ZOOM_HINTS</property> prope
 To set the zoom hints for a window, use
 <xref linkend='XSetZoomHints' xrefstyle='select: title'/>.
 This function is no longer supported by the
-<emphasis remap='I'>Inter-Client Communication Conventions Manual</emphasis>.
+<citetitle>Inter-Client Communication Conventions Manual</citetitle>.
 </para>
 <indexterm significance="preferred"><primary>XSetZoomHints</primary></indexterm>
 <!-- .sM -->
@@ -431,7 +431,7 @@ errors.
 To read the zoom hints for a window, use
 <xref linkend='XGetZoomHints' xrefstyle='select: title'/>.
 This function is no longer supported by the
-<emphasis remap='I'>Inter-Client Communication Conventions Manual</emphasis>.
+<citetitle>Inter-Client Communication Conventions Manual</citetitle>.
 </para>
 <indexterm significance="preferred"><primary>XGetZoomHints</primary></indexterm>
 <!-- .sM -->
diff --git a/specs/libX11/CH01.xml b/specs/libX11/CH01.xml
index 081e80c4..67744cfa 100644
--- a/specs/libX11/CH01.xml
+++ b/specs/libX11/CH01.xml
@@ -685,7 +685,7 @@ What you do inside of your top-level window, however,
 is up to your application.
 For further information,
 see <link linkend='Inter_Client_Communication_Functions'>chapter 14</link>
-and the <citetitle>Inter-Client Communication Conventions Manual</citetitle>.
+and the <olink targetdoc='icccm' targetptr='icccm'><citetitle>Inter-Client Communication Conventions Manual</citetitle></olink>.
     </para>
   </listitem>
 </itemizedlist>
diff --git a/specs/libX11/CH03.xml b/specs/libX11/CH03.xml
index e2468580..7d2b20e5 100644
--- a/specs/libX11/CH03.xml
+++ b/specs/libX11/CH03.xml
@@ -1214,7 +1214,7 @@ you should set these properties for top-level windows before mapping them.
 <!-- .LP -->
 For further information,
 see <link linkend='Inter_Client_Communication_Functions'>chapter 14</link> and
-the <emphasis remap='I'>Inter-Client Communication Conventions Manual</emphasis>.
+the <olink targetdoc='icccm' targetptr='icccm'><citetitle>Inter-Client Communication Conventions Manual</citetitle></olink>.
 </para>
 <para>
 <!-- .LP -->
diff --git a/specs/libX11/CH04.xml b/specs/libX11/CH04.xml
index a3f47d54..3d5596a3 100644
--- a/specs/libX11/CH04.xml
+++ b/specs/libX11/CH04.xml
@@ -893,7 +893,7 @@ see <link linkend='Inter_Client_Communication_Functions'>chapter 14</link>.
 <!-- .LP -->
 The core protocol imposes no semantics on these property names,
 but semantics are specified in other X Consortium standards,
-such as the <emphasis remap='I'>Inter-Client Communication Conventions Manual</emphasis>
+such as the <olink targetdoc='icccm' targetptr='icccm'><citetitle>Inter-Client Communication Conventions Manual</citetitle></olink>
 and the <emphasis remap='I'>X Logical Font Description Conventions</emphasis>.
 </para>
 <para>
diff --git a/specs/libX11/CH06.xml b/specs/libX11/CH06.xml
index 1a6709cd..b84ce95c 100644
--- a/specs/libX11/CH06.xml
+++ b/specs/libX11/CH06.xml
@@ -7109,8 +7109,9 @@ a class of output devices.
 <indexterm><primary>Device Color Characterization</primary></indexterm>
 For details about how color characterization data is
 stored in root window properties,
-see the section on Device Color Characterization in the
-<emphasis remap='I'>Inter-Client Communication Conventions Manual</emphasis>.
+see <olink targetdoc='icccm' targetptr='Device_Color_Characterization'>the
+section on Device Color Characterization in the
+<citetitle>Inter-Client Communication Conventions Manual</citetitle></olink>.
 The LINEAR_RGB function set is provided by Xlib
 and will support most color monitors.
 Function sets may require data that differs
diff --git a/specs/libX11/CH10.xml b/specs/libX11/CH10.xml
index 2024592b..9c12ef71 100644
--- a/specs/libX11/CH10.xml
+++ b/specs/libX11/CH10.xml
@@ -4632,8 +4632,10 @@ The owner should convert the selection based on the specified target type
 and send a
 <symbol>SelectionNotify</symbol>
 event back to the requestor.
-A complete specification for using selections is given in the X Consortium
-standard <emphasis remap='I'>Inter-Client Communication Conventions Manual</emphasis>.
+A <olink targetdoc='icccm'
+targetptr='Peer_to_Peer_Communication_by_Means_of_Selections'>complete
+specification for using selections</olink> is given in the X Consortium
+standard <citetitle>Inter-Client Communication Conventions Manual</citetitle>.
 </para>
 </sect2>
 <sect2 id="SelectionNotify_Events">
diff --git a/specs/libX11/CH12.xml b/specs/libX11/CH12.xml
index ae8017b2..cc14fe64 100644
--- a/specs/libX11/CH12.xml
+++ b/specs/libX11/CH12.xml
@@ -1926,7 +1926,7 @@ error.
 Xlib provides functions that you can use to set and get the input focus.
 The input focus is a shared resource, and cooperation among clients is
 required for correct interaction.  See the
-<emphasis remap='I'>Inter-Client Communication Conventions Manual</emphasis> 
+<olink targetdoc='icccm' targetptr='Input_Focus'><citetitle>Inter-Client Communication Conventions Manual</citetitle></olink>
 for input focus policy.
 </para>
 <para>
diff --git a/specs/libX11/CH14.xml b/specs/libX11/CH14.xml
index ee14b95e..6dc947a9 100644
--- a/specs/libX11/CH14.xml
+++ b/specs/libX11/CH14.xml
@@ -4,11 +4,12 @@
 <chapter id='Inter_Client_Communication_Functions'>
 <title>Inter-Client Communication Functions</title>
 <para>
-The Inter-Client Communication Conventions Manual, hereafter referred to as the <acronym>ICCCM</acronym>,
+The <citetitle>Inter-Client Communication Conventions Manual</citetitle>,
+hereafter referred to as the <acronym>ICCCM</acronym>,
 details the X Consortium approved conventions that govern inter-client communications. These
 conventions ensure peer-to-peer client cooperation in the use of selections, cut buffers, and shared
 resources as well as client cooperation with window and session managers. For further information,
-see the Inter-Client Communication Conventions Manual.
+see the <olink targetdoc='icccm' targetptr='icccm'><citetitle>Inter-Client Communication Conventions Manual</citetitle></olink>.
 </para>
 <para>
 Xlib provides a number of standard properties and programming interfaces that are <acronym>ICCCM</acronym>
@@ -313,8 +314,9 @@ function sends a <property>WM_CHANGE_STATE</property>
 <symbol>ClientMessage</symbol>
 event with a format of 32 and a first data element of 
 <symbol>IconicState</symbol>
-(as described in section 4.1.4 of the 
-<emphasis remap='I'>Inter-Client Communication Conventions Manual</emphasis>)
+(as described in <olink targetdoc='icccm' targetptr='Changing_Window_State'
+>section 4.1.4 of the
+<citetitle>Inter-Client Communication Conventions Manual</citetitle></olink>)
 and a window of w
 to the root window of the specified screen
 with an event mask set to