diff --git wp-includes/theme.php wp-includes/theme.php
index 9d2f905..b091df1 100644
--- wp-includes/theme.php
+++ wp-includes/theme.php
@@ -1754,6 +1754,10 @@ function add_theme_support( $feature ) {
 		$_wp_theme_features[$feature] = true;
 	else
 		$_wp_theme_features[$feature] = array_slice( func_get_args(), 1 );
+		
+	if ( $feature == 'post-formats' ) {
+		$_wp_theme_features[$feature][0] = array_intersect( $_wp_theme_features[$feature][0], get_post_format_slugs() );
+	}
 }
 
 /**