diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php
index 5ead282a13..ad1728b732 100644
--- a/wp-admin/includes/media.php
+++ b/wp-admin/includes/media.php
@@ -140,6 +140,11 @@ function image_add_caption( $html, $id, $caption, $title, $align, $url, $size, $
 
 	$width = $matches[1];
 
+	$caption = str_replace(	array( '>',		'<',	'"',		"'" ),
+							array( '&gt;',	'&lt;',	'&quot;',	'&#039;' ),
+							$caption
+						  );
+	
 	$html = preg_replace( '/(class=["\'][^\'"]*)align(none|left|right|center)\s?/', '$1', $html );
 	if ( empty($align) )
 		$align = 'none';