diff --git a/source/distro/doc/user-manual.odt b/source/distro/doc/user-manual.odt
index 14394ff..b278569 100644
Binary files a/source/distro/doc/user-manual.odt and b/source/distro/doc/user-manual.odt differ
diff --git a/source/oxt/writer2latex/help/en/org.openoffice.da.writer2latex.oxt/export.xhp b/source/oxt/writer2latex/help/en/org.openoffice.da.writer2latex.oxt/export.xhp
index 48bce4b..4c3a77f 100644
--- a/source/oxt/writer2latex/help/en/org.openoffice.da.writer2latex.oxt/export.xhp
+++ b/source/oxt/writer2latex/help/en/org.openoffice.da.writer2latex.oxt/export.xhp
@@ -12,7 +12,7 @@
         <paragraph role="paragraph" xml-lang="en-US">Exports the current document in LaTeX 2e format. A LaTeX document can be
         typeset with the TeX typesetting system.</paragraph>
         <section id="howtoget" xml-lang="en-US">
-        	Choose <emph>File - Export - LaTeX 2e</emph>
+        	Choose <emph>File - Export - LaTeX 2e</emph> or click the <emph>TeX</emph>-button in the toolbar
         </section>
         
         <paragraph role="heading" level="2" xml-lang="en-US">General</paragraph>
diff --git a/source/oxt/writer2xhtml/W2XDialogs2/EpubOptions.xdl b/source/oxt/writer2xhtml/W2XDialogs2/EpubOptions.xdl
index e6e119a..66f267f 100755
--- a/source/oxt/writer2xhtml/W2XDialogs2/EpubOptions.xdl
+++ b/source/oxt/writer2xhtml/W2XDialogs2/EpubOptions.xdl
@@ -95,7 +95,7 @@
    </dlg:menupopup>
   </dlg:menulist>
   <dlg:checkbox dlg:id="IncludeToc" dlg:tab-index="27" dlg:left="190" dlg:top="190" dlg:width="155" dlg:height="12" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:EpubOptionsIncludeToc" dlg:value="Also include original table of contents" dlg:checked="false"/>
-  <dlg:checkbox dlg:id="IncludeNCX" dlg:tab-index="28" dlg:left="190" dlg:top="204" dlg:width="155" dlg:height="12" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:EpubOptionsIncludeToc" dlg:value="Include EPUB 2 navigation" dlg:checked="false"/>
+  <dlg:checkbox dlg:id="IncludeNCX" dlg:tab-index="28" dlg:left="190" dlg:top="204" dlg:width="155" dlg:height="12" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:EpubOptionsIncludeNCX" dlg:value="Include EPUB 2 navigation" dlg:checked="false"/>
   <dlg:button dlg:id="ExportButton" dlg:tab-index="33" dlg:left="5" dlg:top="230" dlg:width="55" dlg:height="12" dlg:value="Export" dlg:button-type="ok"/>
   <dlg:button dlg:id="CancelButton" dlg:tab-index="34" dlg:left="70" dlg:top="230" dlg:width="55" dlg:height="12" dlg:value="Cancel" dlg:button-type="cancel"/>
   <dlg:button dlg:id="EditMetadata" dlg:tab-index="35" dlg:left="135" dlg:top="230" dlg:width="100" dlg:height="12" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:EpubOptionsEditMetadata" dlg:value="Edit document properties">
diff --git a/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/epub_export.xhp b/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/epub_export.xhp
index 43b1b65..ca7b891 100644
--- a/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/epub_export.xhp
+++ b/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/epub_export.xhp
@@ -11,7 +11,9 @@
         <paragraph role="heading" level="1" xml-lang="en-US">EPUB Export (Writer)</paragraph>
         <paragraph role="paragraph" xml-lang="en-US">Exports the current document to EPUB format.</paragraph>
         <section id="howtoget" xml-lang="en-US">
-        	Choose <emph>File - Export - EPUB</emph>
+        	Choose <emph>File - Export - EPUB</emph><br/>
+        	or <emph>File - Export - EPUB 3</emph><br/>
+        	or click the <emph>EPUB-button</emph> in the toolbar
         </section>
         
         <paragraph role="heading" level="2" xml-lang="en-US">Style</paragraph>
@@ -134,18 +136,6 @@
        	%PRODUCTNAME document are exported as comments in the EPUB document. They will not be directly visible in the reader.
        	If the option is not selected, notes are completely ignored.</paragraph>
 
-    	<bookmark xml-lang="en-US" branch="hid/org.openoffice.da.writer2xhtml.oxt:EpubOptionsUseDublinCore" id="bm_options_usedublincore"/>
-   		<paragraph role="paragraph" xml-lang="en-US"><ahelp hid="org.openoffice.da.writer2xhtml.oxt:EpubOptionsUseDublinCore" visibility="hidden">Check this if you want to export all document properties</ahelp></paragraph>
-       	<paragraph role="heading" level="3" xml-lang="en-US">Export optional document properties</paragraph>
-   	    <paragraph role="paragraph" xml-lang="en-US">If you select this option, all the document properties (File – Properties)
-       	are exported, otherwise only the title is exported.</paragraph>
-
-    	<bookmark xml-lang="en-US" branch="hid/org.openoffice.da.writer2xhtml.oxt:EpubOptionsEditMetadata" id="bm_options_editmetadata"/>
-   		<paragraph role="paragraph" xml-lang="en-US"><ahelp hid="org.openoffice.da.writer2xhtml.oxt:EpubOptionsEditMetadata" visibility="hidden">Clik this to edit the document properties, e.g. author, title, date</ahelp></paragraph>
-        <paragraph role="heading" level="3" xml-lang="en-US">Edit document properties</paragraph>
-       	<paragraph role="paragraph" xml-lang="en-US">Click this button to open the dialog to edit the document properties such as
-       	title, author or date.</paragraph>
-
       	<paragraph role="heading" level="2" xml-lang="en-US">Document division (page breaks)</paragraph>
    		<paragraph role="paragraph" xml-lang="en-US">These settings lets you insert page breaks at various places in the document.
    		It is recommended always to use one or more of these settings. One reason for this is that it enhances the readability of
@@ -231,6 +221,23 @@
    		<paragraph role="paragraph" xml-lang="en-US"><ahelp hid="org.openoffice.da.writer2xhtml.oxt:EpubOptionsIncludeToc" visibility="hidden">Check this to include the original table of contents in addition to the EPUB content table</ahelp></paragraph>
         <paragraph role="paragraph" xml-lang="en-US">Your document may also include a normal table of contents.
         Check this if you want to include this table of contents in addition to the navigation table.</paragraph>
+        
+    	<bookmark xml-lang="en-US" branch="hid/org.openoffice.da.writer2xhtml.oxt:EpubOptionsIncludeNCX" id="bm_options_includencx"/>
+        <paragraph role="heading" level="3" xml-lang="en-US">Include EPUB 2 navigation (EPUB 3 only)</paragraph>
+   		<paragraph role="paragraph" xml-lang="en-US"><ahelp hid="org.openoffice.da.writer2xhtml.oxt:EpubOptionsIncludeNCX" visibility="hidden">Check this to include navigation information in EPUB 2 format</ahelp></paragraph>
+        <paragraph role="paragraph" xml-lang="en-US">EPUB 3 uses a new format for the navigation information.
+        Check this option if you also want to include navigation information in the old format.
+        This will ensure compatibility with older EPUB readers.</paragraph>
+
+        <paragraph role="heading" level="2" xml-lang="en-US">Document properties</paragraph>        
+        
+        <bookmark xml-lang="en-US" branch="hid/org.openoffice.da.writer2xhtml.oxt:EpubOptionsEditMetadata" id="bm_options_editmetadata"/>
+   		<paragraph role="paragraph" xml-lang="en-US"><ahelp hid="org.openoffice.da.writer2xhtml.oxt:EpubOptionsEditMetadata" visibility="hidden">Clik this to edit the document properties, e.g. author, title, date</ahelp></paragraph>
+        <paragraph role="heading" level="3" xml-lang="en-US">Edit document properties</paragraph>
+       	<paragraph role="paragraph" xml-lang="en-US">Click this button to open the dialog to edit the document properties such as
+       	title, author or date.</paragraph>
+
+        
 
 	</body>
 </helpdocument>
diff --git a/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/epub_metadata.xhp b/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/epub_metadata.xhp
index 597b3b8..fb9ba1c 100644
--- a/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/epub_metadata.xhp
+++ b/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/epub_metadata.xhp
@@ -11,7 +11,9 @@
         <paragraph role="heading" level="1" xml-lang="en-US">EPUB document properties (Writer)</paragraph>
         <paragraph role="paragraph" xml-lang="en-US">Edit the document properties for an EPUB document.</paragraph>
         <section id="howtoget" xml-lang="en-US">
-        	Choose <emph>File - Export - EPUB, Click Edit in the dialog</emph>
+        	Choose <emph>File - Export - EPUB</emph> or <emph>File - Export - EPUB 3</emph>,
+        	and click <emph>Edit document properties</emph> in the export dialog<br/>
+        	or click the <emph>EPUB-button</emph> marked with <emph>i</emph> in the toolbar
         </section>
 
     
diff --git a/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/export.xhp b/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/export.xhp
index f4717f3..07fe769 100644
--- a/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/export.xhp
+++ b/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/export.xhp
@@ -14,7 +14,8 @@
         	Choose <emph>File - Export - XHTML 1.0 strict</emph><br/>
         	or <emph>File - Export - XHTML 1.1</emph><br/>
         	or <emph>File - Export - XHTML 1.1 + MathML 2.0</emph><br/>
-        	or <emph>File - Export - HTML5</emph>
+        	or <emph>File - Export - HTML5</emph><br/>
+        	or click the <emph>HTML5-button</emph> in the toolbar
         </section>
         
         <paragraph role="heading" level="2" xml-lang="en-US">Style</paragraph>
diff --git a/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/export_calc.xhp b/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/export_calc.xhp
index 6b9dd8f..e609d4c 100644
--- a/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/export_calc.xhp
+++ b/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/export_calc.xhp
@@ -13,7 +13,8 @@
         <section id="howtoget" xml-lang="en-US">
         	Choose <emph>File - Export - XHTML 1.0 strict</emph><br/>
         	or <emph>File - Export - XHTML 1.1</emph><br/>
-        	or <emph>File - Export - HTML5</emph>
+        	or <emph>File - Export - HTML5</emph><br/>
+        	or click the <emph>HTML5-button</emph> in the toolbar
         </section>
         
     	<bookmark xml-lang="en-US" branch="hid/org.openoffice.da.writer2xhtml.oxt:OptionsCalcConfig" id="bm_optionscalc_config"/>