diff --git a/source/distro/Readme.txt b/source/distro/Readme.txt
index 3677612..f2f8f07 100644
--- a/source/distro/Readme.txt
+++ b/source/distro/Readme.txt
@@ -14,5 +14,5 @@ Bugs and feature requests should be reported to
   henrikjust (at) openoffice.org
   
 
-April 2010
+May 2010
 Henrik Just
diff --git a/source/distro/changelog.txt b/source/distro/changelog.txt
index f85a85b..c7c71b4 100644
--- a/source/distro/changelog.txt
+++ b/source/distro/changelog.txt
@@ -2,6 +2,10 @@ Changelog for Writer2LaTeX version 1.0 -> 1.2
 
 ---------- version 1.1.3 ----------
 
+[w2x] The standard configuration cleanxhtml.xml now maps footnote and endnote references to <sup>
+
+[w2x] EPUB bugfix: Now includes the entire heading in NCX even if it contains formatting (which is ignored)
+
 [w2l] Added help content for custom format
 
 [all] Filter: Fixed bug with filenames containing spaces and other special characters
diff --git a/source/distro/doc/user-manual.odt b/source/distro/doc/user-manual.odt
index fd46f6a..edf5a4d 100644
Binary files a/source/distro/doc/user-manual.odt and b/source/distro/doc/user-manual.odt differ
diff --git a/source/java/writer2latex/xhtml/Converter.java b/source/java/writer2latex/xhtml/Converter.java
index 5fb6c5c..22de196 100644
--- a/source/java/writer2latex/xhtml/Converter.java
+++ b/source/java/writer2latex/xhtml/Converter.java
@@ -426,7 +426,7 @@ public class Converter extends ConverterBase {
     }
     
     /* get inline text, ignoring any draw objects, footnotes, formatting and hyperlinks */
-    private String getPlainInlineText(Node node) {
+    protected String getPlainInlineText(Node node) {
     	StringBuffer buf = new StringBuffer();
         Node child = node.getFirstChild();
         while (child!=null) {
diff --git a/source/java/writer2latex/xhtml/TextConverter.java b/source/java/writer2latex/xhtml/TextConverter.java
index 9af6de9..e839132 100644
--- a/source/java/writer2latex/xhtml/TextConverter.java
+++ b/source/java/writer2latex/xhtml/TextConverter.java
@@ -20,7 +20,7 @@
  *
  *  All Rights Reserved.
  * 
- *  Version 1.2 (2010-05-13)
+ *  Version 1.2 (2010-05-17)
  *
  */
 
@@ -580,7 +580,7 @@ public class TextConverter extends ConverterHelper {
                 // Add in external content. For single file output we include all level 1 headings + their target
                 // For multi-file output, the included heading levels depends on the split leve, and we don't include targets 
                 if (nLevel<=Math.max(nSplit,1)) {
-                	converter.addContentEntry(sLabel+(sLabel.length()>0 ? " " : "")+Misc.getPCDATA(onode), nLevel,
+                	converter.addContentEntry(sLabel+(sLabel.length()>0 ? " " : "")+converter.getPlainInlineText(onode), nLevel,
                 			nSplit==0 ? sTarget : null);
                 }
 
diff --git a/source/java/writer2latex/xhtml/config/cleanxhtml.xml b/source/java/writer2latex/xhtml/config/cleanxhtml.xml
index adbaa44..a8d4917 100644
--- a/source/java/writer2latex/xhtml/config/cleanxhtml.xml
+++ b/source/java/writer2latex/xhtml/config/cleanxhtml.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- cleanxhtml.xml
+<!-- cleanxhtml.xml 2010-05-17
      This is a sample configuration file for Writer2xhtml.
      The options are set to produce a clean XHTML file using
      standard XHTML elements, using a custom style sheet for
@@ -46,6 +46,9 @@ block-element="blockquote" block-css="(none)" element="p" css="(none)" />
   <xhtml-style-map name="User entry" family="text" element="kbd" css="(none)" />
   <xhtml-style-map name="Variable" family="text" element="var" css="(none)" />
   
+  <xhtml-style-map name="Footnote anchor" family="text" element="sup" css="(none)" />
+  <xhtml-style-map name="Endnote anchor" family="text" element="sup" css="(none)" />
+  
   <!-- map OOo hard formatting attributes to xhtml elements -->
   <xhtml-style-map name="bold" family="attribute" element="b" css="(none)" />
   <xhtml-style-map name="italics" family="attribute" element="i" css="(none)" />
diff --git a/source/readme-source.txt b/source/readme-source.txt
index 2cd4a1d..581d83d 100644
--- a/source/readme-source.txt
+++ b/source/readme-source.txt
@@ -72,7 +72,7 @@ In addition to oxt, the build file supports the following targets:
     clean
 
 
-Henrik Just, April 2010
+Henrik Just, May 2010
 
 
 Thanks to Michael Niedermair for writing the original ant build file