diff --git a/components/file.inc b/components/file.inc
index 4a5654f..42d63b4 100644
--- a/components/file.inc
+++ b/components/file.inc
@@ -99,7 +99,7 @@ function _webform_edit_file($component) {
       '#default_value' => array_intersect($current_types, $types),
     );
 
-    $types = array('txt', 'rtf', 'html', 'odf', 'pdf', 'doc', 'docx', 'ppt', 'pptx', 'xls', 'xlsx', 'xml');
+    $types = array('txt', 'rtf', 'html', 'odf', 'odt', 'ods', 'odp', 'pdf', 'doc', 'docx', 'ppt', 'pptx', 'xls', 'xlsx', 'xml');
     $form['validation']['extensions']['types']['documents'] = array(
       '#type' => 'checkboxes',
       '#title' => t('Documents'),
@@ -528,4 +528,3 @@ function webform_file_usage_adjust($submission) {
     }
   }
 }
-
diff --git a/webform.install b/webform.install
index 19dacf4..8a3ef7b 100644
--- a/webform.install
+++ b/webform.install
@@ -831,3 +831,33 @@ function webform_update_7319(&$sandbox) {
 function webform_update_7320() {
   db_query("UPDATE {file_managed} SET status = 1 WHERE fid IN (SELECT fid FROM {file_usage} WHERE module = :module_name)", array(':module_name' => 'webform'));
 }
+
+/**
+ * Fix components that had the 'odf' extension allowed.
+ */
+function webform_update_7321() {
+  $components = db_query("SELECT nid, cid, extra FROM {webform_component} WHERE type = 'file'")->fetchAll();
+
+  foreach ($components as $component) {
+    $component->extra = unserialize($component->extra);
+    if (!empty($component->extra['filtering']['types'])) {
+      if (array_search('odt', $component->extra['filtering']['types']) === FALSE) {
+        // Add the OpenOffice.org file types.
+        $component->extra['filtering']['types'][] = 'odt';
+        $component->extra['filtering']['types'][] = 'ods';
+        $component->extra['filtering']['types'][] = 'odp';
+
+        // Add odf to the manual list of allowed extensions?
+        //$addextensions = explode(',', $component->extra['filtering']['addextensions']);
+        //$addextensions[] = 'odf';
+        //$component->extra['filtering']['addextensions'] = implode(',', $addextensions);
+
+        db_update('webform_component')
+          ->fields(array('extra' => serialize($component->extra)))
+          ->condition('nid' => $component->nid)
+          ->condition('cid' => $component->cid)
+          ->execute();
+      }
+    }
+  }
+}
