diff --git a/pdf/src/plugin-resources/fo-body.xslt b/pdf/src/plugin-resources/fo-body.xslt
index e90e333b..c106e92b 100644
--- a/pdf/src/plugin-resources/fo-body.xslt
+++ b/pdf/src/plugin-resources/fo-body.xslt
@@ -104,7 +104,9 @@
     <xsl:param name="chapterNumber"/>
     <xsl:param name="fileName"/>
     <xsl:param name="transLink">
-      <xsl:value-of select="translate(@name,' ','_')"/>
+      <xsl:call-template name="escapeNameToken">
+        <xsl:with-param name="oldString" select="@name"/>
+      </xsl:call-template>
     </xsl:param>
     <fo:block xsl:use-attribute-sets="body.h1" id="{$fileName}#{$transLink}">
       <xsl:value-of select="@name"/>
@@ -120,11 +122,20 @@
       </xsl:apply-templates>
     </fo:block>
   </xsl:template>
+  <xsl:template name="escapeNameToken">
+    <!-- Same transformation as done by the escapeNameToken tag of xdoc -->
+    <xsl:param name="oldString"/>
+    <xsl:variable name="replaceChars"> .,;!?/'\()[]{}+*°</xsl:variable>
+    <xsl:variable name="replaceWith">___________________</xsl:variable>
+    <xsl:value-of select="translate($oldString,$replaceChars,$replaceWith)"/>
+  </xsl:template>
   <xsl:template match="subsection">
     <xsl:param name="chapterNumber"/>
     <xsl:param name="fileName"/>
     <xsl:param name="transLink">
-      <xsl:value-of select="translate(@name,' ','_')"/>
+      <xsl:call-template name="escapeNameToken">
+        <xsl:with-param name="oldString" select="@name"/>
+      </xsl:call-template>
     </xsl:param>
     <fo:block xsl:use-attribute-sets="body.h2" id="{$fileName}#{$transLink}">
       <xsl:value-of select="@name"/>