diff --git a/glossary.xml b/glossary.xml
index 5f33c011e8ab6ec87cf9c7ec4fda3b1a5e0911d1..40c1fc8f0d2107d1cec764124fd6ecf8e52d1dfb 100644
--- a/glossary.xml
+++ b/glossary.xml
@@ -89,7 +89,7 @@
       <glossterm><productname>Eclipse</productname></glossterm>
 
       <glossdef>
-        <para>Java <xref linkend="glo_IDE"/> available from <link
+        <para>Java <link linkend="glo_IDE">IDE</link> available from <link
         xlink:href="http://eclipse.org">eclipse.org</link>.</para>
       </glossdef>
     </glossentry>
@@ -133,7 +133,7 @@
 
         <glosslist>
           <glossentry>
-            <glossterm><xref linkend="glo_Junit"/></glossterm>
+            <glossterm><link linkend="glo_Junit">Junit</link></glossterm>
 
             <glossdef>
               <para>Management of unit tests.</para>
@@ -406,8 +406,8 @@
 
       <glossdef>
         <para><link xlink:href="http://maven.apache.org">project object
-        model</link> file describing a <xref linkend="glo_Maven"/> project or
-        module</para>
+        model</link> file describing a <link linkend="glo_Maven">Maven</link>
+        project or module</para>
       </glossdef>
     </glossentry>