diff --git a/src/liborcus/odf_helper.cpp b/src/liborcus/odf_helper.cpp
index 3e4cd6d102e4eff56f3d4d32fd1598994459b155..c06f390dbc092ee3ab1c5163939f941078911e8e 100644
--- a/src/liborcus/odf_helper.cpp
+++ b/src/liborcus/odf_helper.cpp
@@ -22,22 +22,22 @@ typedef mdds::sorted_string_map<spreadsheet::border_style_t> odf_border_style_ma
 
 odf_border_style_map::entry odf_border_style_entries[] =
 {
-    { MDDS_ASCII("unknown"), spreadsheet::border_style_t::unknown},
-    { MDDS_ASCII("none"), spreadsheet::border_style_t::none},
-    { MDDS_ASCII("solid"), spreadsheet::border_style_t::solid},
-    { MDDS_ASCII("dash_dot"), spreadsheet::border_style_t::dash_dot},
-    { MDDS_ASCII("dash_dot_dot"), spreadsheet::border_style_t::dash_dot_dot},
+    { MDDS_ASCII("dash-dot"), spreadsheet::border_style_t::dash_dot},
+    { MDDS_ASCII("dash-dot-dot"), spreadsheet::border_style_t::dash_dot_dot},
     { MDDS_ASCII("dashed"), spreadsheet::border_style_t::dashed},
     { MDDS_ASCII("dotted"), spreadsheet::border_style_t::dotted},
-    { MDDS_ASCII("double_border"), spreadsheet::border_style_t::double_border},
+    { MDDS_ASCII("double-border"), spreadsheet::border_style_t::double_border},
     { MDDS_ASCII("hair"), spreadsheet::border_style_t::hair},
     { MDDS_ASCII("medium"), spreadsheet::border_style_t::medium},
-    { MDDS_ASCII("medium_dash_dot"), spreadsheet::border_style_t::medium_dash_dot},
-    { MDDS_ASCII("medium_dash_dot_dot"), spreadsheet::border_style_t::medium_dash_dot_dot},
-    { MDDS_ASCII("medium_dashed"), spreadsheet::border_style_t::medium_dashed},
-    { MDDS_ASCII("slant_dash_dot"), spreadsheet::border_style_t::slant_dash_dot},
+    { MDDS_ASCII("medium-dash-dot"), spreadsheet::border_style_t::medium_dash_dot},
+    { MDDS_ASCII("medium-dash-dot-dot"), spreadsheet::border_style_t::medium_dash_dot_dot},
+    { MDDS_ASCII("medium-dashed"), spreadsheet::border_style_t::medium_dashed},
+    { MDDS_ASCII("none"), spreadsheet::border_style_t::none},
+    { MDDS_ASCII("slant-dash-dot"), spreadsheet::border_style_t::slant_dash_dot},
+    { MDDS_ASCII("solid"), spreadsheet::border_style_t::solid},
     { MDDS_ASCII("thick"), spreadsheet::border_style_t::thick},
-    { MDDS_ASCII("thin"), spreadsheet::border_style_t::thin}
+    { MDDS_ASCII("thin"), spreadsheet::border_style_t::thin},
+    { MDDS_ASCII("unknown"), spreadsheet::border_style_t::unknown}
 };
 
 
diff --git a/src/liborcus/odf_styles_context_test.cpp b/src/liborcus/odf_styles_context_test.cpp
index 838bf2d55e9cbee863553863d371c54f6fb0ec9d..276495722f26696df394d1359c6f1fbb347f0f7f 100644
--- a/src/liborcus/odf_styles_context_test.cpp
+++ b/src/liborcus/odf_styles_context_test.cpp
@@ -86,18 +86,16 @@ int main()
     assert(cell_format);
 
     cell_border = styles.get_border(border);
-    assert(cell_border->top.style == orcus::spreadsheet::border_style_t::dashed);
+    assert(cell_border->top.style == orcus::spreadsheet::border_style_t::solid);
     assert(cell_border->bottom.style == orcus::spreadsheet::border_style_t::thin);
     assert(cell_border->left.style == orcus::spreadsheet::border_style_t::none);
-    assert(cell_border->right.style == orcus::spreadsheet::border_style_t::thin);
+    assert(cell_border->right.style == orcus::spreadsheet::border_style_t::dash_dot_dot);
     assert(cell_border->top.border_color.red == 0xff);
     assert(cell_border->bottom.border_color.green == 0xee);
     assert(cell_border->left.border_color.blue == 0x11);
     assert(cell_border->right.border_width.value == 0.22);
     assert(cell_border->bottom.border_width.value == 1.74);
 
-    //TODO : These border styles dont work :- solid,dash_dot,dash_dot_dot ...and some others
-
     /*Test that border applies to the diagonal*/
     style = find_cell_style_by_name("Name3", &styles);
     xf = style->xf;
@@ -106,8 +104,8 @@ int main()
     assert(cell_format);
 
     cell_border = styles.get_border(border);
-    assert(cell_border->diagonal_bl_tr.style == orcus::spreadsheet::border_style_t::thick);
-    assert(cell_border->diagonal_tl_br.style == orcus::spreadsheet::border_style_t::thin);
+    assert(cell_border->diagonal_bl_tr.style == orcus::spreadsheet::border_style_t::medium);
+    assert(cell_border->diagonal_tl_br.style == orcus::spreadsheet::border_style_t::medium_dash_dot);
     assert(cell_border->diagonal_bl_tr.border_color.red == 0xff);
     assert(cell_border->diagonal_tl_br.border_color.green == 0x00);
     assert(cell_border->diagonal_tl_br.border_width.value == 0.74);
diff --git a/test/ods/styles/cell-styles.xml b/test/ods/styles/cell-styles.xml
index e9b944d1a1845d3d19bf70bd1fbe46a572c142a7..8ba326e6b6a3d690526b10535fcdb17194f042e1 100644
--- a/test/ods/styles/cell-styles.xml
+++ b/test/ods/styles/cell-styles.xml
@@ -4,12 +4,12 @@
     <style:table-cell-properties fo:background-color="#feffcc" fo:border="0.06pt thick #ffcc12"/>
   </style:style>
   <style:style style:name="Name2" style:family="table-cell" style:parent-style-name="Text">
-<style:table-cell-properties fo:border-top="0.74pt dashed #ffee11" fo:border-bottom="1.74pt thin #aeee11" fo:border-left="0.74pt none #11ee11" fo:border-right="0.22pt thin #05ee11"/>
+<style:table-cell-properties fo:border-top="0.74pt solid #ffee11" fo:border-bottom="1.74pt thin #aeee11" fo:border-left="0.74pt none #11ee11" fo:border-right="0.22pt dash-dot-dot #05ee11"/>
   </style:style>
   <style:style style:name="Name3" style:family="table-cell" style:parent-style-name="Text">
-<style:table-cell-properties fo:diagonal-bl-tr="1.74pt thick #ffccee" fo:diagonal-tl-br="0.74pt thin #120000" fo:border-left="none" fo:border-right="0.74pt dotted #000000"/>
+<style:table-cell-properties fo:diagonal-bl-tr="1.74pt medium #ffccee" fo:diagonal-tl-br="0.74pt medium-dash-dot #120000" fo:border-left="none" fo:border-right="0.74pt dotted #000000"/>
   </style:style>
   <style:style style:name="Name4" style:family="table-cell" style:parent-style-name="Text">
-<style:table-cell-properties fo:border-top="0.74pt double_border #000000" fo:border-bottom="none" fo:border-left="0.74pt hair #000000" fo:border-right="0.74pt medium #000000"/>
+<style:table-cell-properties fo:border-top="0.74pt double-border #000000" fo:border-bottom="none" fo:border-left="0.74pt hair #000000" fo:border-right="0.74pt medium #000000"/>
   </style:style>
 </office:styles>