diff --git a/pdf/xdocs/faq.fml b/pdf/xdocs/faq.fml
index 73a39624..9a034788 100644
--- a/pdf/xdocs/faq.fml
+++ b/pdf/xdocs/faq.fml
@@ -85,7 +85,7 @@
     <faq id="how-images">
       <question>Which types of images can I use in my documents ?</question>
       <answer>
-        <p>You can use images types that <a href="http://xml.apache.org/fop/graphics.html">FOP</a> can use.</p>
+        <p>You can use images types that <a href="http://xmlgraphics.apache.org/fop/0.20.5/graphics.html">FOP</a> can use.</p>
         <p>The table below summarizes the <em>theoretical</em> support for graphical formats within FOP.</p>
         <table>
           <thead>
@@ -98,56 +98,56 @@
           <tbody>
             <tr>
               <td>
-                <a href="http://xml.apache.org/fop/graphics.html#bmp">BMP</a> (Microsoft Windows Bitmap)</td>
+                <a href="http://xmlgraphics.apache.org/fop/0.20.5/graphics.html#bmp">BMP</a> (Microsoft Windows Bitmap)</td>
               <td>bitmap</td>
               <td>
-                <a href="http://xml.apache.org/fop/graphics.html#native">FOP native</a>
+                <a href="http://xmlgraphics.apache.org/fop/0.20.5/graphics.html#native">FOP native</a>
               </td>
             </tr>
             <tr>
               <td>
-                <a href="http://xml.apache.org/fop/graphics.html#eps">EPS</a> (Encapsulated PostScript)</td>
+                <a href="http://xmlgraphics.apache.org/fop/0.20.5/graphics.html#eps">EPS</a> (Encapsulated PostScript)</td>
               <td>metafile (both bitmap and vector), probably most frequently used for vector drawings</td>
               <td>
-                <a href="http://xml.apache.org/fop/graphics.html#native">FOP native</a> (limited support, see restrictions below)</td>
+                <a href="http://xmlgraphics.apache.org/fop/0.20.5/graphics.html#native">FOP native</a> (limited support, see restrictions below)</td>
             </tr>
             <tr>
               <td>GIF (Graphics Interchange Format)</td>
               <td>bitmap</td>
               <td>
-                <a href="http://xml.apache.org/fop/graphics.html#native">FOP native</a>
+                <a href="http://xmlgraphics.apache.org/fop/0.20.5/graphics.html#native">FOP native</a>
               </td>
             </tr>
             <tr>
               <td>
-                <a href="http://xml.apache.org/fop/graphics.html#jpeg">JPEG</a> (Joint Photographic Experts Group)</td>
+                <a href="http://xmlgraphics.apache.org/fop/0.20.5/graphics.html#jpeg">JPEG</a> (Joint Photographic Experts Group)</td>
               <td>bitmap</td>
               <td>
-                <a href="http://xml.apache.org/fop/graphics.html#native">FOP native</a>
+                <a href="http://xmlgraphics.apache.org/fop/0.20.5/graphics.html#native">FOP native</a>
               </td>
             </tr>
             <tr>
               <td>
-                <a href="http://xml.apache.org/fop/graphics.html#png">PNG</a> (Portable Network Graphic)</td>
+                <a href="http://xmlgraphics.apache.org/fop/0.20.5/graphics.html#png">PNG</a> (Portable Network Graphic)</td>
               <td>bitmap</td>
               <td>
-                <a href="http://xml.apache.org/fop/graphics.html#jimi">JIMI</a> (using the property <a href="properties.html">"maven.jar.jimi"</a>) or <a href="http://xml.apache.org/fop/graphics.html#jai">JAI</a> (using properties <a href="properties.html">"maven.jar.jaicore" and "maven.jar.jaicodec"</a>)
+                <a href="http://xmlgraphics.apache.org/fop/0.20.5/graphics.html#jimi">JIMI</a> (using the property <a href="properties.html">"maven.jar.jimi"</a>) or <a href="http://xmlgraphics.apache.org/fop/0.20.5/graphics.html#jai">JAI</a> (using properties <a href="properties.html">"maven.jar.jaicore" and "maven.jar.jaicodec"</a>)
               </td>
             </tr>
             <tr>
               <td>
-                <a href="http://xml.apache.org/fop/graphics.html#svg">SVG</a> (Scalable Vector Graphics)</td>
+                <a href="http://xmlgraphics.apache.org/fop/0.20.5/graphics.html#svg">SVG</a> (Scalable Vector Graphics)</td>
               <td>vector (with embedded bitmaps)</td>
               <td>
-                <a href="http://xml.apache.org/fop/graphics.html#batik">Batik</a>
+                <a href="http://xmlgraphics.apache.org/fop/0.20.5/graphics.html#batik">Batik</a>
               </td>
             </tr>
             <tr>
               <td>
-                <a href="http://xml.apache.org/fop/graphics.html#tiff">TIFF</a> (Tag Image Format File)</td>
+                <a href="http://xmlgraphics.apache.org/fop/0.20.5/graphics.html#tiff">TIFF</a> (Tag Image Format File)</td>
               <td>bitmap</td>
               <td>
-                <a href="http://xml.apache.org/fop/graphics.html#native">FOP native</a> or <a href="http://xml.apache.org/fop/graphics.html#jai">JAI</a> (using properties <a href="properties.html">"maven.jar.jaicore" and "maven.jar.jaicodec"</a>), depending on the subformat. See <a href="http://xml.apache.org/fop/graphics.html#tiff">TIFF</a> for more details.(JIMI also supports TIFF, but this has not been implemented within FOP).</td>
+                <a href="http://xmlgraphics.apache.org/fop/0.20.5/graphics.html#native">FOP native</a> or <a href="http://xmlgraphics.apache.org/fop/0.20.5/graphics.html#jai">JAI</a> (using properties <a href="properties.html">"maven.jar.jaicore" and "maven.jar.jaicodec"</a>), depending on the subformat. See <a href="http://xmlgraphics.apache.org/fop/0.20.5/graphics.html#tiff">TIFF</a> for more details.(JIMI also supports TIFF, but this has not been implemented within FOP).</td>
             </tr>
           </tbody>
         </table>
diff --git a/pdf/xdocs/index.xml b/pdf/xdocs/index.xml
index 3d996bb0..adc63ed2 100644
--- a/pdf/xdocs/index.xml
+++ b/pdf/xdocs/index.xml
@@ -60,7 +60,7 @@
           <code>id</code> tag.
         </li>
         <li>
-          Other issues are available in <a href="http://jira.codehaus.org/secure/IssueNavigator.jspa?reset=true&amp;pid=10356&amp;statusIds=1" target="_blank">Jira</a>.
+          Other issues are available in <a href="http://jira.codehaus.org/browse/MPPDF" target="_blank">Jira</a>.
         </li>
       </ul>
     </section>