diff --git modules/filter/filter.module modules/filter/filter.module
index b3c2e9b..d8bac70 100644
--- modules/filter/filter.module
+++ modules/filter/filter.module
@@ -890,13 +890,14 @@ function _filter_url_trim($text, $length = NULL) {
  */
 function _filter_autop($text) {
   // All block level tags
-  $block = '(?:table|thead|tfoot|caption|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|form|blockquote|address|p|h[1-6]|hr)';
-
-  // Split at <pre>, <script>, <style> and </pre>, </script>, </style> tags.
-  // We don't apply any processing to the contents of these tags to avoid messing
-  // up code. We look for matched pairs and allow basic nesting. For example:
-  // "processed <pre> ignored <script> ignored </script> ignored </pre> processed"
-  $chunks = preg_split('@(<(?:!--.*?--|/?(?:pre|script|style|object)[^>]*)>)@si', $text, -1, PREG_SPLIT_DELIM_CAPTURE);
+  $block = '(?:table|thead|tfoot|caption|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|form|blockquote|address|p|h[1-6]|hr|article|aside|figcaption|figure|footer|header|hgroup|output|section)';
+
+  // Split at <pre>, <script>, <style>, <object>, <canvas>, <progress>,
+  // <audio>, <video>, and matching closing tags. We don't apply any processing
+  // to the contents of these tags to avoid messing up code. We look for
+  // matched pairs and allow basic nesting. For example: "processed <pre>
+  // ignored <script> ignored </script> ignored </pre> processed"
+  $chunks = preg_split('@(<(?:!--.*?--|/?(?:pre|script|style|object|canvas|progress|audio|video)[^>]*)>)@si', $text, -1, PREG_SPLIT_DELIM_CAPTURE);
   // Note: PHP ensures the array consists of alternating delimiters and literals
   // and begins and ends with a literal (inserting NULL as required).
   $ignore = FALSE;