diff --git a/bbcode-filter.inc b/bbcode-filter.inc
index 8e83091870284834c20caeb04cbe80f89089ffc7..5c5fe469b3ed44a379594fd4993c9d1d2da72cc2 100644
--- a/bbcode-filter.inc
+++ b/bbcode-filter.inc
@@ -231,7 +231,7 @@ function _bbcode_filter_process(&$body, $settings) {
     // Links to popular sites
     '#\[google(?::\w+)?\]([\w\s-]+?)\[/google(?::\w+)?\]#si' => '<a href="http://www.google.com/search?q=\\1">\\1</a>',
     '#\[wikipedia(?::\w+)?\]([\w\s-]+?)\[/wikipedia(?::\w+)?\]#si' => '<a href="http://www.wikipedia.org/wiki/\\1">\\1</a>',
-    '#\[youtube\]([0-9a-zA-Z_\-]+)\[/youtube\]#si' => '<object width="425" height="366"><param name="movie" value="http://www.youtube.com/v/\\1"></param><embed src="http://www.youtube.com/v/\\1" type="application/x-shockwave-flash" width="425" height="366"></embed></object>',
+    '#\[youtube\]([0-9a-zA-Z_\-]+)\[/youtube\]#si' => '<iframe width="425" height="366" src="//www.youtube.com/embed/\\1" frameborder="0" allowfullscreen></iframe>',
     // Table tags
     '#\[table\](.+?)\[/table\]#si' => '<table class="bb-table">\\1</table>',
     '#\[(row|r|tr)\](.+?)\[/(row|r|tr)\]#si' => '<tr>\\2</tr>',