diff --git a/wp-admin/includes/meta-boxes.php b/wp-admin/includes/meta-boxes.php
index 8d71d02e7..70666000c 100644
--- a/wp-admin/includes/meta-boxes.php
+++ b/wp-admin/includes/meta-boxes.php
@@ -155,7 +155,7 @@ echo esc_html( $visibility_trans ); ?></span>
 </div><?php // /misc-pub-section ?>
 
 <?php
-if ( 'post' == $post->post_type && current_theme_supports( 'post-formats' ) ) :
+if ( current_theme_supports( 'post-formats' ) && post_type_supports( $post->post_type, 'post-formats' ) ) :
 $post_formats = get_theme_support( 'post-formats' );
 
 $post_formats_display = get_post_format_strings();
diff --git a/wp-includes/post.php b/wp-includes/post.php
index 2927b7187..5e07e850b 100644
--- a/wp-includes/post.php
+++ b/wp-includes/post.php
@@ -24,7 +24,7 @@ function create_initial_post_types() {
 		'hierarchical' => false,
 		'rewrite' => false,
 		'query_var' => false,
-		'supports' => array( 'title', 'editor', 'author', 'thumbnail', 'excerpt', 'sticky', 'trackbacks', 'custom-fields', 'comments', 'revisions' ),
+		'supports' => array( 'title', 'editor', 'author', 'thumbnail', 'excerpt', 'sticky', 'trackbacks', 'custom-fields', 'comments', 'revisions', 'post-formats' ),
 	) );
 
 	register_post_type( 'page', array(