diff --git a/inc/config.php b/inc/config.php
index 9f62a19d..10c9faa5 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -999,7 +999,7 @@
 	// It's very important that you match the entire input (with ^ and $) or things will not work correctly.
 	$config['embedding'] = array(
 		array(
-			'/^https?:\/\/(?:\w+\.)?youtube\.com\/watch\?(?:&?v=([a-zA-Z0-9\-_]{10,11})|(&?start=\d*)|(&?end=\d*)|(?:&?[^&]+))*$/i',
+			'/^https?:\/\/(?:\w+\.)?(?:youtube\.com\/watch\?|youtu\.be\/)(?:(?:&?v=)?([a-zA-Z0-9\-_]{10,11})\??|&?(start=\d*)|&?(end=\d*)|(?:&?[^&]+))*$/i',
 			'<iframe style="float: left;margin: 10px 20px;" width="%%tb_width%%" height="%%tb_height%%" frameborder="0" id="ytplayer" src="http://youtube.com/embed/$1?$2$3"></iframe>'
 		),
 		array(
@@ -1657,7 +1657,7 @@
 	$config['board_regex'] = '[0-9a-zA-Z$_\x{0080}-\x{FFFF}]{1,58}';
 
 	// Youtube.js embed HTML code
-	$config['youtube_js_html'] = '<div class="video-container" data-video="$1" data-params="$2$3">'.
+	$config['youtube_js_html'] = '<div class="video-container" data-video="$1" data-params="&$2&$3">'.
 		'<a href="$0" target="_blank" class="file">'.
 		'<img style="width:360px;height:270px;" src="//img.youtube.com/vi/$1/0.jpg" class="post-image"/>'.
 		'</a></div>';
diff --git a/inc/instance-config.php b/inc/instance-config.php
index f6b4d0b6..5076da2a 100644
--- a/inc/instance-config.php
+++ b/inc/instance-config.php
@@ -162,7 +162,7 @@
 
 	$config['embedding'] = array(
 		array(
-			'/^https?:\/\/(\w+\.)?(?:youtube\.com\/watch\?v=|youtu\.be\/)([a-zA-Z0-9\-_]{10,11})(&.+)?$/i',
+			'/^https?:\/\/(?:\w+\.)?(?:youtube\.com\/watch\?|youtu\.be\/)(?:(?:&?v=)?([a-zA-Z0-9\-_]{10,11})\??|&?(start=\d*)|&?(end=\d*)|(?:&?[^&]+))*$/i',
 			$config['youtube_js_html']
 		),
 		array(
diff --git a/js/youtube.js b/js/youtube.js
index 8aa03211..c4ef77fb 100644
--- a/js/youtube.js
+++ b/js/youtube.js
@@ -28,7 +28,7 @@ onready(function(){
 		$('div.video-container a', tag).click(function() {
 			$(this.parentNode).html('<iframe style="float:left;margin: 10px 20px" type="text/html" '+
 				'width="360" height="270" src="//www.youtube.com/embed/' + $(this.parentNode).data('video') +
-				'?'+ $(this.parentNode).data('params') +'autoplay=1&html5=1" allowfullscreen frameborder="0"/>');
+				'?autoplay=1&html5=1'+ $(this.parentNode).data('params') +'" allowfullscreen frameborder="0"/>');
 
 			return false;
 		});