diff --git a/markdown.c b/markdown.c
index db0e0b98..8a45a593 100644
--- a/markdown.c
+++ b/markdown.c
@@ -102,7 +102,7 @@ int main(int argc, char * argv[]) {
     g_option_group_add_entries (ext_group, ext_entries);
     g_option_context_add_group (context, ext_group);
     g_option_context_set_description (context, "Converts text in specified files (or stdin) from markdown to FORMAT.\n"
-                                               "Available FORMATs:  html, latex, groff-mm");
+                                               "Available FORMATs:  html, latex, groff-mm, odf");
     if (!g_option_context_parse (context, &argc, &argv, &error)) {
         g_print ("option parsing failed: %s\n", error->message);
         exit (1);
@@ -136,6 +136,8 @@ int main(int argc, char * argv[]) {
         output_format = LATEX_FORMAT;
     else if (strcmp(opt_to, "groff-mm") == 0)
         output_format = GROFF_MM_FORMAT;
+    else if (strcmp(opt_to, "odf") == 0)
+        output_format = ODF_FORMAT;
     else {
         fprintf(stderr, "%s: Unknown output format '%s'\n", progname, opt_to);
         exit(EXIT_FAILURE);
diff --git a/markdown_lib.h b/markdown_lib.h
index f1845d3a..bcd6e43c 100644
--- a/markdown_lib.h
+++ b/markdown_lib.h
@@ -12,7 +12,8 @@ enum markdown_extensions {
 enum markdown_formats {
     HTML_FORMAT,
     LATEX_FORMAT,
-    GROFF_MM_FORMAT
+    GROFF_MM_FORMAT,
+    ODF_FORMAT
 };
 
 GString * markdown_to_g_string(char *text, int extensions, int output_format);
diff --git a/markdown_output.c b/markdown_output.c
index f4a43701..b814a4ec 100644
--- a/markdown_output.c
+++ b/markdown_output.c
@@ -22,8 +22,10 @@
 #include <assert.h>
 #include <glib.h>
 #include "markdown_peg.h"
+#include "odf.c"
 
 static int extensions;
+static int odf_type = 0;
 
 static void print_html_string(GString *out, char *str, bool obfuscate);
 static void print_html_element_list(GString *out, element *list, bool obfuscate);
@@ -34,6 +36,11 @@ static void print_latex_element(GString *out, element *elt);
 static void print_groff_string(GString *out, char *str);
 static void print_groff_mm_element_list(GString *out, element *list);
 static void print_groff_mm_element(GString *out, element *elt, int count);
+static void print_odf_code_string(GString *out, char *str);
+static void print_odf_string(GString *out, char *str);
+static void print_odf_element_list(GString *out, element *list);
+static void print_odf_element(GString *out, element *elt);
+static bool list_contains_key(element *list, int key);
 
 /**********************************************************************
 
@@ -55,6 +62,25 @@ static void pad(GString *out, int num) {
     padded = num;
 }
 
+/* determine whether a certain element is contained within a given list */
+bool list_contains_key(element *list, int key) {
+    element *step = NULL;
+
+    step = list;
+    while ( step != NULL ) {
+        if (step->key == key) {
+            return TRUE;
+        }
+        if (step->children != NULL) {
+            if (list_contains_key(step->children, key)) {
+                return TRUE;
+            }
+        }
+       step = step->next;
+    }
+    return FALSE;
+}
+
 /**********************************************************************
 
   Functions for printing Elements as HTML
@@ -726,6 +752,335 @@ static void print_groff_mm_element(GString *out, element *elt, int count) {
     }
 }
 
+/**********************************************************************
+
+  Functions for printing Elements as ODF
+
+ ***********************************************************************/
+
+/* print_odf_code_string - print string, escaping for HTML and saving newlines 
+*/
+static void print_odf_code_string(GString *out, char *str) {
+    char *tmp;
+    while (*str != '\0') {
+        switch (*str) {
+        case '&':
+            g_string_append_printf(out, "&amp;");
+            break;
+        case '<':
+            g_string_append_printf(out, "&lt;");
+            break;
+        case '>':
+            g_string_append_printf(out, "&gt;");
+            break;
+        case '"':
+            g_string_append_printf(out, "&quot;");
+            break;
+        case '\n':
+            g_string_append_printf(out, "<text:line-break/>");
+            break;
+        case ' ':
+            tmp = str;
+            tmp++;
+            if (*tmp == ' ') {
+                tmp++;
+                if (*tmp == ' ') {
+                    tmp++;
+                    if (*tmp == ' ') {
+                        g_string_append_printf(out, "<text:tab/>");
+                        str = tmp;
+                    } else {
+                        g_string_append_printf(out, " ");
+                    }
+                } else {
+                    g_string_append_printf(out, " ");
+                }
+            } else {
+                g_string_append_printf(out, " ");
+            }
+            break;
+        default:
+               g_string_append_c(out, *str);
+        }
+    str++;
+    }
+}
+
+/* print_odf_string - print string, escaping for HTML and saving newlines */
+static void print_odf_string(GString *out, char *str) {
+    char *tmp;
+    while (*str != '\0') {
+        switch (*str) {
+        case '&':
+            g_string_append_printf(out, "&amp;");
+            break;
+        case '<':
+            g_string_append_printf(out, "&lt;");
+            break;
+        case '>':
+            g_string_append_printf(out, "&gt;");
+            break;
+        case '"':
+            g_string_append_printf(out, "&quot;");
+            break;
+        case '\n':
+            tmp = str;
+            tmp--;
+            if (*tmp == ' ') {
+                tmp--;
+                if (*tmp == ' ') {
+                    g_string_append_printf(out, "<text:line-break/>");
+                } else {
+                    g_string_append_printf(out, "\n");
+                }
+            } else {
+                g_string_append_printf(out, "\n");
+            }
+            break;
+        case ' ':
+            tmp = str;
+            tmp++;
+            if (*tmp == ' ') {
+                tmp++;
+                if (*tmp == ' ') {
+                    tmp++;
+                    if (*tmp == ' ') {
+                        g_string_append_printf(out, "<text:tab/>");
+                        str = tmp;
+                    } else {
+                        g_string_append_printf(out, " ");
+                    }
+                } else {
+                    g_string_append_printf(out, " ");
+                }
+            } else {
+                g_string_append_printf(out, " ");
+            }
+            break;
+        default:
+               g_string_append_c(out, *str);
+        }
+    str++;
+    }
+}
+
+/* print_odf_element_list - print an element list as ODF */
+void print_odf_element_list(GString *out, element *list) {
+    while (list != NULL) {
+        print_odf_element(out, list);
+        list = list->next;
+    }
+}
+
+/* print_odf_element - print an element as ODF */
+void print_odf_element(GString *out, element *elt) {
+    int lev;
+    int old_type = 0;
+    switch (elt->key) {
+    case SPACE:
+        g_string_append_printf(out, "%s", elt->contents.str);
+        break;
+    case LINEBREAK:
+        g_string_append_printf(out, "<text:line-break/>");
+        break;
+    case STR:
+        print_html_string(out, elt->contents.str, 0);
+        break;
+    case ELLIPSIS:
+        g_string_append_printf(out, "&hellip;");
+        break;
+    case EMDASH:
+        g_string_append_printf(out, "&mdash;");
+        break;
+    case ENDASH:
+        g_string_append_printf(out, "&ndash;");
+        break;
+    case APOSTROPHE:
+        g_string_append_printf(out, "&rsquo;");
+        break;
+    case SINGLEQUOTED:
+        g_string_append_printf(out, "&lsquo;");
+        print_odf_element_list(out, elt->children);
+        g_string_append_printf(out, "&rsquo;");
+        break;
+    case DOUBLEQUOTED:
+        g_string_append_printf(out, "&ldquo;");
+        print_odf_element_list(out, elt->children);
+        g_string_append_printf(out, "&rdquo;");
+        break;
+    case CODE:
+        g_string_append_printf(out, "<text:span text:style-name=\"Source_20_Text\">");
+        print_html_string(out, elt->contents.str, 0);
+        g_string_append_printf(out, "</text:span>");
+        break;
+    case HTML:
+        break;
+    case LINK:
+        g_string_append_printf(out, "<text:a xlink:type=\"simple\" xlink:href=\"");
+        print_html_string(out, elt->contents.link->url, 0);
+        g_string_append_printf(out, "\"");
+        if (strlen(elt->contents.link->title) > 0) {
+            g_string_append_printf(out, " office:name=\"");
+            print_html_string(out, elt->contents.link->title, 0);
+            g_string_append_printf(out, "\"");
+        }
+        g_string_append_printf(out, ">");
+        print_odf_element_list(out, elt->contents.link->label);
+        g_string_append_printf(out, "</text:a>");
+        break;
+    case IMAGE:
+        g_string_append_printf(out, "<draw:frame text:anchor-type=\"as-char\"\ndraw:z-index=\"0\" draw:style-name=\"fr1\" svg:width=\"95%%\"");
+        g_string_append_printf(out, ">\n<draw:text-box><text:p><draw:frame text:anchor-type=\"as-char\" draw:z-index=\"1\" ");
+        g_string_append_printf(out, "><draw:image xlink:href=\"");
+        print_odf_string(out, elt->contents.link->url);
+        g_string_append_printf(out,"\" xlink:type=\"simple\" xlink:show=\"embed\" xlink:actuate=\"onLoad\" draw:filter-name=\"&lt;All formats&gt;\"/>\n</draw:frame></text:p>");
+        g_string_append_printf(out, "</draw:text-box></draw:frame>\n");
+        break;
+    case EMPH:
+        g_string_append_printf(out,
+            "<text:span text:style-name=\"MMD-Italic\">");
+        print_odf_element_list(out, elt->children);
+        g_string_append_printf(out, "</text:span>");
+        break;
+    case STRONG:
+        g_string_append_printf(out,
+            "<text:span text:style-name=\"MMD-Bold\">");
+        print_odf_element_list(out, elt->children);
+        g_string_append_printf(out, "</text:span>");
+        break;
+    case LIST:
+        print_odf_element_list(out, elt->children);
+        break;
+    case RAW:
+        /* Shouldn't occur - these are handled by process_raw_blocks() */
+        assert(elt->key != RAW);
+        break;
+    case H1: case H2: case H3: case H4: case H5: case H6:
+        lev = elt->key - H1 + 1;  /* assumes H1 ... H6 are in order */
+        g_string_append_printf(out, "<text:h text:outline-level=\"%d\">", lev);
+        print_odf_element_list(out, elt->children);
+        g_string_append_printf(out, "</text:h>\n");
+        padded = 0;
+        break;
+    case PLAIN:
+        print_odf_element_list(out, elt->children);
+        padded = 0;
+        break;
+    case PARA:
+        g_string_append_printf(out, "<text:p");
+        switch (odf_type) {
+            case BLOCKQUOTE:
+                g_string_append_printf(out," text:style-name=\"Quotations\"");
+                break;
+            case CODE:
+                g_string_append_printf(out," text:style-name=\"Preformatted Text\"");
+                break;
+            case VERBATIM:
+                g_string_append_printf(out," text:style-name=\"Preformatted Text\"");
+                break;
+            case ORDEREDLIST:
+            case BULLETLIST:
+                g_string_append_printf(out," text:style-name=\"P2\"");
+                break;
+            case NOTE:
+                g_string_append_printf(out," text:style-name=\"Footnote\"");
+                break;
+            default:
+                g_string_append_printf(out," text:style-name=\"Standard\"");
+                break;
+        }
+        g_string_append_printf(out, ">");
+        print_odf_element_list(out, elt->children);
+        g_string_append_printf(out, "</text:p>\n");
+        break;
+    case HRULE:
+        g_string_append_printf(out,"<text:p text:style-name=\"Horizontal_20_Line\"/>\n");
+        break;
+    case HTMLBLOCK:
+        /* don't print HTML block */
+        /* but do print HTML comments for raw ODF */
+        if (strncmp(elt->contents.str,"<!--",4) == 0) {
+            /* trim "-->" from end */
+            elt->contents.str[strlen(elt->contents.str)-3] = '\0';
+            g_string_append_printf(out, "%s", &elt->contents.str[4]);
+        }
+        break;
+    case VERBATIM:
+        old_type = odf_type;
+        odf_type = VERBATIM;
+        g_string_append_printf(out, "<text:p text:style-name=\"Preformatted Text\">");
+        print_odf_code_string(out, elt->contents.str);
+        g_string_append_printf(out, "</text:p>\n");
+        odf_type = old_type;
+        break;
+    case BULLETLIST:
+        if ((odf_type == BULLETLIST) ||
+            (odf_type == ORDEREDLIST)) {
+            /* I think this was made unnecessary by another change.
+            Same for ORDEREDLIST below */
+            /*  g_string_append_printf(out, "</text:p>"); */
+        }
+        old_type = odf_type;
+        odf_type = BULLETLIST;
+        g_string_append_printf(out, "%s", "<text:list>");
+        print_odf_element_list(out, elt->children);
+        g_string_append_printf(out, "%s", "</text:list>");
+        odf_type = old_type;
+        break;
+    case ORDEREDLIST:
+        if ((odf_type == BULLETLIST) ||
+            (odf_type == ORDEREDLIST)) {
+            /* g_string_append_printf(out, "</text:p>"); */
+        }
+        old_type = odf_type;
+        odf_type = ORDEREDLIST;
+        g_string_append_printf(out, "%s", "<text:list>\n");
+        print_odf_element_list(out, elt->children);
+        g_string_append_printf(out, "%s", "</text:list>\n");
+        odf_type = old_type;
+        break;
+    case LISTITEM:
+        g_string_append_printf(out, "<text:list-item>\n");
+        if (elt->children->children->key != PARA) {
+            g_string_append_printf(out, "<text:p text:style-name=\"P2\">");
+        }
+        print_odf_element_list(out, elt->children);
+
+        if ((list_contains_key(elt->children,BULLETLIST) ||
+            (list_contains_key(elt->children,ORDEREDLIST)))) {
+            } else {
+                if (elt->children->children->key != PARA) {
+                    g_string_append_printf(out, "</text:p>");
+                }
+            }
+        g_string_append_printf(out, "</text:list-item>\n");
+        break;
+    case BLOCKQUOTE:
+        old_type = odf_type;
+        odf_type = BLOCKQUOTE;
+        print_odf_element_list(out, elt->children);
+        odf_type = old_type;
+        break;
+    case REFERENCE:
+        break;
+    case NOTE:
+        old_type = odf_type;
+        odf_type = NOTE;
+        /* if contents.str == 0 then print; else ignore - like above */
+        if (elt->contents.str == 0) {
+            g_string_append_printf(out, "<text:note text:id=\"\" text:note-class=\"footnote\"><text:note-body>\n");
+            print_odf_element_list(out, elt->children);
+            g_string_append_printf(out, "</text:note-body>\n</text:note>\n");
+       }
+        elt->children = NULL;
+        odf_type = old_type;
+        break;
+        break;  default:
+        fprintf(stderr, "print_odf_element encountered unknown element key = %d\n", elt->key);
+        exit(EXIT_FAILURE);
+    }
+}
+
 /**********************************************************************
 
   Parameterized function for printing an Element.
@@ -753,6 +1108,12 @@ void print_element_list(GString *out, element *elt, int format, int exts) {
     case GROFF_MM_FORMAT:
         print_groff_mm_element_list(out, elt);
         break;
+    case ODF_FORMAT:
+        print_odf_header(out);
+        g_string_append_printf(out, "<office:body>\n<office:text>\n");
+        if (elt != NULL) print_odf_element_list(out,elt);
+        print_odf_footer(out);
+        break;
     default:
         fprintf(stderr, "print_element - unknown format = %d\n", format); 
         exit(EXIT_FAILURE);