diff --git a/wp-includes/media.php b/wp-includes/media.php
index afda95886..ac0049011 100644
--- a/wp-includes/media.php
+++ b/wp-includes/media.php
@@ -854,7 +854,7 @@ function gallery_shortcode($attr) {
 			</{$icontag}>";
 		if ( $captiontag && trim($attachment->post_excerpt) ) {
 			$output .= "
-				<{$captiontag} class='gallery-caption'>
+				<{$captiontag} class='wp-caption-text gallery-caption'>
 				" . wptexturize($attachment->post_excerpt) . "
 				</{$captiontag}>";
 		}