diff --git a/Packages/Simple_Youtube_Video_Embedder_BBC_v1.1.tar.gz b/Packages/Simple_Youtube_Video_Embedder_BBC_v1.1.tar.gz
new file mode 100644
index 0000000..6fd9817
Binary files /dev/null and b/Packages/Simple_Youtube_Video_Embedder_BBC_v1.1.tar.gz differ
diff --git a/Packages/backups/2014-02-04_before_Simple_Youtube_Video_Embedder_BBC_v1.tar.gz b/Packages/backups/2014-02-04_before_Simple_Youtube_Video_Embedder_BBC_v1.tar.gz
new file mode 100644
index 0000000..6d4979a
Binary files /dev/null and b/Packages/backups/2014-02-04_before_Simple_Youtube_Video_Embedder_BBC_v1.tar.gz differ
diff --git a/Packages/installed.list b/Packages/installed.list
index 0c048f7..5b8db9e 100644
--- a/Packages/installed.list
+++ b/Packages/installed.list
@@ -1 +1 @@
-1391538208
\ No newline at end of file
+1391538735
\ No newline at end of file
diff --git a/Sources/Post.php b/Sources/Post.php
index 31a1acc..dce20fa 100644
--- a/Sources/Post.php
+++ b/Sources/Post.php
@@ -1531,7 +1531,7 @@ function Post2()
 		preparsecode($_POST['message']);
 
 		// Let's see if there's still some content left without the tags.
-		if ($smcFunc['htmltrim'](strip_tags(parse_bbc($_POST['message'], false), '<img>')) === '' && (!allowedTo('admin_forum') || strpos($_POST['message'], '[html]') === false))
+		if ($smcFunc['htmltrim'](strip_tags(parse_bbc($_POST['message'], false), '<object><embed><iframe><object><embed><iframe><img>')) === '' && (!allowedTo('admin_forum') || strpos($_POST['message'], '[html]') === false))
 			$post_errors[] = 'no_message';
 	}
 	if (isset($_POST['calendar']) && !isset($_REQUEST['deleteevent']) && $smcFunc['htmltrim']($_POST['evtitle']) === '')
diff --git a/Sources/Subs.php b/Sources/Subs.php
index 874dcd8..96f65f1 100644
--- a/Sources/Subs.php
+++ b/Sources/Subs.php
@@ -1610,6 +1610,18 @@ function parse_bbc($message, $smileys = true, $cache_id = '', $parse_tags = arra
 				'disallow_children' => array('email', 'ftp', 'url', 'iurl'),
 				'disabled_after' => ' ($1)',
 			),
+			array(
+				'tag' => 'youtube',
+				'type' => 'unparsed_content',
+				'content' => '<iframe style="border:0;" width="642" height="392" src="http://www.youtube.com/embed/$1" allowfullscreen></iframe>',
+				'validate' => create_function('&$tag, &$data, $disabled', '
+				if (isset($disabled[\'url\']))
+					$tag[\'content\'] = \'http://www.youtube.com/watch?v=$1\';
+				$pattern = \'~(?:http|https|)(?::\/\/|)(?:www.|)(?:youtu\.be\/|youtube\.com(?:\/embed\/|\/v\/|\/watch\?v=|\/ytscreeningroom\?v=|\/feeds\/api\/videos\/|\/user\S*[^\w\-\s]|\S*[^\w\-\s]))([\w\-]{11})[a-z0-9;:@?&%=+\/\$_.-]*~i\';
+				if (preg_match($pattern, $data, $matches))
+					$data = $matches[1];'),
+				'disabled_content' => 'http://www.youtube.com/watch?v=$1',
+			),
 			array(
 				'tag' => 'white',
 				'before' => '<span style="color: white;" class="bbc_color">',
@@ -1853,11 +1865,14 @@ function parse_bbc($message, $smileys = true, $cache_id = '', $parse_tags = arra
 						$data = strtr($data, array('&#039;' => '\'', '&nbsp;' => $context['utf8'] ? "\xC2\xA0" : "\xA0", '&quot;' => '>">', '"' => '<"<', '&lt;' => '<lt<'));
 
 						// Only do this if the preg survives.
+						//First line in each array added by "Simple_Youtube_Video_Embed_BBC" mod to parse youtube videos automatically
 						if (is_string($result = preg_replace(array(
+							'~(?:http|https|)(?::\/\/|)(?:www.|)(?:youtu\.be\/|youtube\.com(?:\/embed\/|\/v\/|\/watch\?v=|\/ytscreeningroom\?v=|\/feeds\/api\/videos\/|\/user\S*[^\w\-\s]|\S*[^\w\-\s]))([\w\-]{11})[a-z0-9;:@?&%=+\/\$_.-]*~i',
 							'~(?<=[\s>\.(;\'"]|^)((?:http|https)://[\w\-_%@:|]+(?:\.[\w\-_%]+)*(?::\d+)?(?:/[\w\-_\~%\.@!,\?&;=#(){}+:\'\\\\]*)*[/\w\-_\~%@\?;=#}\\\\])~i',
 							'~(?<=[\s>\.(;\'"]|^)((?:ftp|ftps)://[\w\-_%@:|]+(?:\.[\w\-_%]+)*(?::\d+)?(?:/[\w\-_\~%\.@,\?&;=#(){}+:\'\\\\]*)*[/\w\-_\~%@\?;=#}\\\\])~i',
 							'~(?<=[\s>(\'<]|^)(www(?:\.[\w\-_]+)+(?::\d+)?(?:/[\w\-_\~%\.@!,\?&;=#(){}+:\'\\\\]*)*[/\w\-_\~%@\?;=#}\\\\])~i'
 						), array(
+							'[youtube]$1[/youtube]',
 							'[url]$1[/url]',
 							'[ftp]$1[/ftp]',
 							'[url=http://$1]$1[/url]'