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 b5bf9dc..2d4fe74 100644
--- a/src/main/java/org/openoffice/da/comp/writer2xhtml/XhtmlOptionsDialog.java
+++ b/src/main/java/org/openoffice/da/comp/writer2xhtml/XhtmlOptionsDialog.java
@@ -83,7 +83,8 @@ public class XhtmlOptionsDialog extends OptionsDialogBase {
         loadTextFieldOption(xProps, "PageBreakStyle");
 
         loadCheckBoxOption(xProps, "InlineCSS");
-
+        loadCheckBoxOption(xProps, "EmbedImg");
+        loadCheckBoxOption(xProps, "EmbedSVG");
         
         // Special content
         loadCheckBoxOption(xProps, "Notes");
@@ -142,6 +143,9 @@ public class XhtmlOptionsDialog extends OptionsDialogBase {
 
         // Special content
         saveCheckBoxOption(xProps, helper, "InlineCSS", "css_inline");
+        saveCheckBoxOption(xProps, helper, "EmbedImg", "embed_svg");
+        saveCheckBoxOption(xProps, helper, "EmbedSVG", "embed_img");
+
         saveCheckBoxOption(xProps, helper, "Notes", "notes");
         saveCheckBoxOption(xProps, helper, "UseDublinCore", "use_dublin_core");
   		
@@ -204,6 +208,8 @@ public class XhtmlOptionsDialog extends OptionsDialogBase {
 
         // Special content
         setControlEnabled("InlineCSS",!isLocked("css_inline"));
+        setControlEnabled("EmbedImg",!isLocked("embed_img"));
+        setControlEnabled("EmbedSVG",!isLocked("embed_svg"));
         
         setControlEnabled("Notes",!isLocked("notes"));
         setControlEnabled("UseDublinCore",!isLocked("use_dublin_core"));
diff --git a/src/main/oxt/writer2xhtml/Options.xcs b/src/main/oxt/writer2xhtml/Options.xcs
index 62ccfa7..2492cac 100644
--- a/src/main/oxt/writer2xhtml/Options.xcs
+++ b/src/main/oxt/writer2xhtml/Options.xcs
@@ -31,6 +31,8 @@
             <prop oor:name="ConfigName" oor:type="xs:string" />
             <prop oor:name="ConvertToPx" oor:type="xs:boolean" />
             <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="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 6e56742..0dda11e 100644
--- a/src/main/oxt/writer2xhtml/Options.xcu
+++ b/src/main/oxt/writer2xhtml/Options.xcu
@@ -183,6 +183,12 @@
         <prop oor:name="InlineCSS" oor:type="xs:boolean">
             <value>true</value>
         </prop>
+        <prop oor:name="EmbedImg" oor:type="xs:boolean">
+            <value>false</value>
+        </prop>
+        <prop oor:name="EmbedSVG" oor:type="xs:boolean">
+            <value>false</value>
+        </prop>
         <prop oor:name="UseSheetNamesAsHeadings" 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 dd1f511..38a4a56 100644
--- a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_en_US.properties
+++ b/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_en_US.properties
@@ -131,3 +131,5 @@
 147.XhtmlOptions.MinimumLetterSpacing.HelpText=Minimum Letter Spacing
 148.XhtmlOptions.MinLetterSpacing.HelpText=Minimum Letter Spacing Value
 152.XhtmlOptions.InlineCSS.Label=Inline CSS
+156.XhtmlOptions.EmbedSVG.Label=Embed SVG
+160.XhtmlOptions.EmbedImg.Label=Embed images
diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_ru_RU.properties b/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_ru_RU.properties
index 69833d0..39f75e3 100644
--- a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_ru_RU.properties
+++ b/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_ru_RU.properties
@@ -131,3 +131,5 @@
 147.XhtmlOptions.MinimumLetterSpacing.HelpText=\u041C\u0438\u043D\u0438\u043C\u0430\u043B\u044C\u043D\u043E\u0435 \u043C\u0435\u0436\u0441\u0438\u043C\u0432\u043E\u043B\u044C\u043D\u043E\u0435 \u0440\u0430\u0441\u0441\u0442\u043E\u044F\u043D\u0438\u0435
 148.XhtmlOptions.MinLetterSpacing.HelpText=\u041C\u0438\u043D\u0438\u043C\u0430\u043B\u044C\u043D\u043E\u0435 \u043C\u0435\u0436\u0441\u0438\u043C\u0432\u043E\u043B\u044C\u043D\u043E\u0435 \u0440\u0430\u0441\u0441\u0442\u043E\u044F\u043D\u0438\u0435
 152.XhtmlOptions.InlineCSS.Label=Inline CSS
+156.XhtmlOptions.EmbedSVG.Label=Embed SVG
+160.XhtmlOptions.EmbedImg.Label=Embed images
diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/XhtmlOptions.xdl b/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/XhtmlOptions.xdl
index 09925f5..bb613fd 100644
--- a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/XhtmlOptions.xdl
+++ b/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/XhtmlOptions.xdl
@@ -68,6 +68,8 @@
   <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="208" dlg:top="38" dlg:width="81" dlg:height="12" dlg:help-text="&amp;151.XhtmlOptions.InlineCSS.HelpText" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:OptionsNotes" dlg:value="&amp;152.XhtmlOptions.InlineCSS.Label" dlg:checked="true"/>
+  <dlg:checkbox dlg:id="InlineCSS" dlg:tab-index="32" dlg:left="209" dlg:top="38" dlg:width="81" dlg:height="12" dlg:help-text="&amp;151.XhtmlOptions.InlineCSS.HelpText" 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="&amp;155.XhtmlOptions.EmbedSVG.HelpText" 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="&amp;159.XhtmlOptions.EmbedImg.HelpText" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:OptionsNotes" dlg:value="&amp;160.XhtmlOptions.EmbedImg.Label" dlg:checked="true"/>
  </dlg:bulletinboard>
 </dlg:window>
\ No newline at end of file