Index: wp-includes/post.php
===================================================================
--- wp-includes/post.php	(revision 21520)
+++ wp-includes/post.php	(working copy)
@@ -979,7 +979,7 @@
 		'capability_type' => 'post', 'capabilities' => array(), 'map_meta_cap' => null,
 		'_builtin' => false, '_edit_link' => 'post.php?post=%d', 'hierarchical' => false,
 		'public' => false, 'rewrite' => true, 'has_archive' => false, 'query_var' => true,
-		'supports' => array(), 'register_meta_box_cb' => null,
+		'supports' => array('title', 'editor'), 'register_meta_box_cb' => null,
 		'taxonomies' => array(), 'show_ui' => null, 'menu_position' => null, 'menu_icon' => null,
 		'can_export' => true,
 		'show_in_nav_menus' => null, 'show_in_menu' => null, 'show_in_admin_bar' => null,
@@ -1031,13 +1031,8 @@
 	if ( is_array( $args->capability_type ) )
 		$args->capability_type = $args->capability_type[0];
 
-	if ( ! empty($args->supports) ) {
-		add_post_type_support($post_type, $args->supports);
-		unset($args->supports);
-	} else {
-		// Add default features
-		add_post_type_support($post_type, array('title', 'editor'));
-	}
+	add_post_type_support($post_type, $args->supports);
+	unset($args->supports);
 
 	if ( false !== $args->query_var && !empty($wp) ) {
 		if ( true === $args->query_var )