diff --git a/e107_admin/image.php b/e107_admin/image.php
index 90834b412..0ddf4376f 100644
--- a/e107_admin/image.php
+++ b/e107_admin/image.php
@@ -729,7 +729,8 @@ class media_admin_ui extends e_admin_ui
 		'youtube_showinfo'				=> array('title'=> "Show Video Info", 'tab'=>2, 'type' => 'boolean', 'data'=>'int', 'help'=>''),
 		'youtube_cc_load_policy'		=> array('title'=> "Show Closed-Captions by default", 'tab'=>2, 'type' => 'boolean', 'data'=>'int', 'help'=>''),
 		'youtube_modestbranding'		=> array('title'=> "Use Modest Branding", 'tab'=>2, 'type' => 'boolean', 'data'=>'int', 'help'=>''),
-		
+		'youtube_bbcode_responsive'		=> array('title'=> "Make the YouTube bbcode responsive", 'tab'=>2, 'type' => 'boolean', 'data'=>'int', 'help'=>''),
+	
 		// 
 
 	);
diff --git a/e107_core/bbcodes/bb_youtube.php b/e107_core/bbcodes/bb_youtube.php
index 64909e8ff..0395b5987 100644
--- a/e107_core/bbcodes/bb_youtube.php
+++ b/e107_core/bbcodes/bb_youtube.php
@@ -333,17 +333,27 @@ class bb_youtube extends e_bb_base
 		$class = "bbcode ".e107::getBB()->getClass('youtube'); // consistent classes across all themes. 
 		
 		$ret = "<!-- Start YouTube-".$dimensions."-".$yID." -->\n";	// <-- DO NOT MODIFY - used for detection by bbcode handler. 	
-		$ret .= '<object class="'.$class.'" width="'.$params['w'].'" height="'.$params['h'].'" >
-			<param name="movie" value="'.$url.'" />
-			<param name="allowFullScreen" value="'.$fscr.'" />
-			<param name="allowscriptaccess" value="always" />
-			<param name="wmode" value="transparent" />
-		';		
-			
-		// Not XHTML - but needed for compatibility. 
-		$ret .= '<embed class="'.$class.'" src="'.$url.'" type="application/x-shockwave-flash" allowscriptaccess="always" allowfullscreen="'.$fscr.'" wmode="transparent" width="'.$params['w'].'" height="'.$params['h'].'" />';
 		
-		$ret .= '</object>';
+		
+		if(e107::getConfig()->get('youtube_bbcode_responsive') == 1) // Responsive Mode. 
+		{
+			$ret .= e107::getParser()->toVideo($yID.".youtube");	
+		}
+		else // Legacy Mode. 
+		{
+			$ret .= '<object class="'.$class.'" width="'.$params['w'].'" height="'.$params['h'].'" >
+				<param name="movie" value="'.$url.'" />
+				<param name="allowFullScreen" value="'.$fscr.'" />
+				<param name="allowscriptaccess" value="always" />
+				<param name="wmode" value="transparent" />
+			';		
+				
+			// Not XHTML - but needed for compatibility. 
+			$ret .= '<embed class="'.$class.'" src="'.$url.'" type="application/x-shockwave-flash" allowscriptaccess="always" allowfullscreen="'.$fscr.'" wmode="transparent" width="'.$params['w'].'" height="'.$params['h'].'" />';
+			
+			$ret .= '</object>';
+		}
+		
 		$ret .= "<!-- End YouTube -->"; // <-- DO NOT MODIFY.