diff --git a/src/main/java/org/openoffice/da/comp/writer2xhtml/XhtmlOptionsDialog.java b/src/main/java/org/openoffice/da/comp/writer2xhtml/XhtmlOptionsDialog.java
index c48c748..651d3c5 100644
--- a/src/main/java/org/openoffice/da/comp/writer2xhtml/XhtmlOptionsDialog.java
+++ b/src/main/java/org/openoffice/da/comp/writer2xhtml/XhtmlOptionsDialog.java
@@ -85,6 +85,8 @@ public class XhtmlOptionsDialog extends OptionsDialogBase {
         loadCheckBoxOption(xProps, "InlineCSS");
         loadCheckBoxOption(xProps, "EmbedImg");
         loadCheckBoxOption(xProps, "EmbedSVG");
+        loadCheckBoxOption(xProps, "Greenstone");
+
         
         // Special content
         loadCheckBoxOption(xProps, "Notes");
@@ -146,6 +148,8 @@ public class XhtmlOptionsDialog extends OptionsDialogBase {
         saveCheckBoxOption(xProps, helper, "InlineCSS", "css_inline");
         saveCheckBoxOption(xProps, helper, "EmbedImg", "embed_svg");
         saveCheckBoxOption(xProps, helper, "EmbedSVG", "embed_img");
+        saveCheckBoxOption(xProps, helper, "Greenstone", "greenstone");
+
         saveCheckBoxOption(xProps, helper, "AlignSplitsToPages","align_splits_to_pages");
 
         saveCheckBoxOption(xProps, helper, "Notes", "notes");
@@ -211,6 +215,8 @@ public class XhtmlOptionsDialog extends OptionsDialogBase {
         setControlEnabled("InlineCSS",!isLocked("css_inline"));
         setControlEnabled("EmbedImg",!isLocked("embed_img"));
         setControlEnabled("EmbedSVG",!isLocked("embed_svg"));
+        setControlEnabled("Greenstone",!isLocked("greenstone"));
+
         setControlEnabled("AlignSplitsToPages",!isLocked("align_splits_to_pages"));
 
         
diff --git a/src/main/oxt/writer2xhtml/Options.xcs b/src/main/oxt/writer2xhtml/Options.xcs
index 35b7bbd..c71e501 100644
--- a/src/main/oxt/writer2xhtml/Options.xcs
+++ b/src/main/oxt/writer2xhtml/Options.xcs
@@ -33,6 +33,7 @@
             <prop oor:name="InlineCSS" oor:type="xs:boolean" />
             <prop oor:name="EmbedSVG" oor:type="xs:boolean" />
             <prop oor:name="EmbedImg" oor:type="xs:boolean" />
+            <prop oor:name="Greenstone" oor:type="xs:boolean" />
             <prop oor:name="Scaling" oor:type="xs:int" />
             <prop oor:name="ColumnScaling" oor:type="xs:int" />
             <prop oor:name="OriginalImageSize" oor:type="xs:boolean"/>
diff --git a/src/main/oxt/writer2xhtml/Options.xcu b/src/main/oxt/writer2xhtml/Options.xcu
index 93a9b17..9541a16 100644
--- a/src/main/oxt/writer2xhtml/Options.xcu
+++ b/src/main/oxt/writer2xhtml/Options.xcu
@@ -32,6 +32,9 @@
         <prop oor:name="Notes" oor:type="xs:boolean">
             <value>true</value>
         </prop>
+        <prop oor:name="Greenstone" oor:type="xs:boolean">
+            <value>false</value>
+        </prop>
         <prop oor:name="UseDublinCore" oor:type="xs:boolean">
             <value>true</value>
         </prop>
diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_en_US.properties b/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_en_US.properties
index bc3c889..cc445b7 100644
--- a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_en_US.properties
+++ b/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_en_US.properties
@@ -83,3 +83,4 @@
 156.XhtmlOptions.EmbedSVG.Label=Embed SVG
 160.XhtmlOptions.EmbedImg.Label=Embed images
 161.XhtmlOptions.AlignSplitsToPages.Label=Align splits to pages
+162.XhtmlOptions.Greenstone.Label=Add Greenstone3 markup
diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_ru_RU.properties b/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_ru_RU.properties
index 187364a..0238c82 100644
--- a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_ru_RU.properties
+++ b/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_ru_RU.properties
@@ -82,4 +82,5 @@
 152.XhtmlOptions.InlineCSS.Label=Inline CSS
 156.XhtmlOptions.EmbedSVG.Label=\u0412\u0441\u0442\u0440\u043E\u0438\u0442\u044C SVG
 160.XhtmlOptions.EmbedImg.Label=\u0412\u0441\u0442\u0440\u043E\u0438\u0442\u044C images
-161.XhtmlOptions.AlignSplitsToPages.Label=\u0412\u044B\u0440\u043E\u0432\u043D\u044F\u0442\u044C\20\u0440\u0430\u0437\u0434\u0435\u043B\u0435\u043D\u0438\u0435\20\u043F\u043E\20\u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0430\u043C
+161.XhtmlOptions.AlignSplitsToPages.Label=\u0420\u0430\u0437\u0434\u0435\u043b\u044f\u0442\u044c \u043f\u043e \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0430\u043c
+162.XhtmlOptions.Greenstone.Label=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0440\u0430\u0437\u043c\u0435\u0442\u043a\u0443 \u0434\u043b\u044f Greenstone3
diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/XhtmlOptions.xdl b/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/XhtmlOptions.xdl
index 33b3403..621197f 100644
--- a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/XhtmlOptions.xdl
+++ b/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/XhtmlOptions.xdl
@@ -68,9 +68,10 @@
   <dlg:text dlg:id="MinimumLetterSpacing" dlg:tab-index="29" dlg:left="9" dlg:top="63" dlg:width="138" dlg:height="12" dlg:help-text="&amp;147.XhtmlOptions.MinimumLetterSpacing.HelpText" dlg:value="&amp;146.XhtmlOptions.MinimumLetterSpacing.Label"/>
   <dlg:textfield dlg:id="MinLetterSpacing" dlg:tab-index="30" dlg:left="151" dlg:top="63" dlg:width="29" dlg:height="12" dlg:help-text="&amp;148.XhtmlOptions.MinLetterSpacing.HelpText"/>
   <dlg:textfield dlg:id="PageBreakStyle" dlg:tab-index="31" dlg:left="90" dlg:top="2" dlg:width="235" dlg:height="13" dlg:help-text="&amp;151.XhtmlOptions.PageBreakStyle.HelpText" dlg:value="&amp;152.XhtmlOptions.PageBreakStyle.Text"/>
-  <dlg:checkbox dlg:id="InlineCSS" dlg:tab-index="32" dlg:left="209" dlg:top="38" dlg:width="81" dlg:height="12" dlg:help-text="" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:OptionsNotes" dlg:value="&amp;152.XhtmlOptions.InlineCSS.Label" dlg:checked="true"/>
-  <dlg:checkbox dlg:id="EmbedSVG" dlg:tab-index="33" dlg:left="208" dlg:top="58" dlg:width="81" dlg:height="12" dlg:help-text="" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:OptionsNotes" dlg:value="&amp;156.XhtmlOptions.EmbedSVG.Label" dlg:checked="true"/>
-  <dlg:checkbox dlg:id="EmbedImg" dlg:tab-index="34" dlg:left="208" dlg:top="75" dlg:width="81" dlg:height="12" dlg:help-text="" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:OptionsNotes" dlg:value="&amp;160.XhtmlOptions.EmbedImg.Label" dlg:checked="true"/>
-  <dlg:checkbox dlg:id="AlignSplitsToPages" dlg:tab-index="35" dlg:left="202" dlg:top="239" dlg:width="81" dlg:height="12" dlg:help-text="" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:OptionsNotes" dlg:value="&amp;161.XhtmlOptions.AlignSplitsToPages.Label" dlg:checked="true"/>
+  <dlg:checkbox dlg:id="InlineCSS" dlg:tab-index="32" dlg:left="190" dlg:top="38" dlg:width="81" dlg:height="12" dlg:help-text="" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:OptionsNotes" dlg:value="&amp;152.XhtmlOptions.InlineCSS.Label" dlg:checked="true"/>
+  <dlg:checkbox dlg:id="EmbedSVG" dlg:tab-index="33" dlg:left="190" dlg:top="58" dlg:width="81" dlg:height="12" dlg:help-text="" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:OptionsNotes" dlg:value="&amp;156.XhtmlOptions.EmbedSVG.Label" dlg:checked="true"/>
+  <dlg:checkbox dlg:id="EmbedImg" dlg:tab-index="34" dlg:left="190" dlg:top="75" dlg:width="81" dlg:height="12" dlg:help-text="" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:OptionsNotes" dlg:value="&amp;160.XhtmlOptions.EmbedImg.Label" dlg:checked="true"/>
+  <dlg:checkbox dlg:id="AlignSplitsToPages" dlg:tab-index="35" dlg:left="190" dlg:top="239" dlg:width="130" dlg:height="12" dlg:help-text="" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:OptionsNotes" dlg:value="&amp;161.XhtmlOptions.AlignSplitsToPages.Label" dlg:checked="true"/>
+ <dlg:checkbox dlg:id="Greenstone" dlg:tab-index="36" dlg:left="190" dlg:top="219" dlg:width="130" dlg:height="12" dlg:help-text="" dlg:value="&amp;162.XhtmlOptions.Greenstone.Label" dlg:checked="false"/>
  </dlg:bulletinboard>
 </dlg:window>