Index: wp-includes/post.php
===================================================================
--- wp-includes/post.php	(revision 13695)
+++ wp-includes/post.php	(working copy)
@@ -25,7 +25,7 @@
 										'hierarchical' => false,
 										'rewrite' => false,
 										'query_var' => false,
-										'supports' => array('post-thumbnails', 'excerpts', 'trackbacks', 'custom-fields', 'comments', 'revisions')
+										'supports' => array('title', 'editor', 'thumbnail', 'excerpt', 'trackbacks', 'custom-fields', 'comments', 'revisions')
 									) );
 
 	register_post_type( 'page', array(	'label' => __('Pages'),
@@ -38,7 +38,7 @@
 										'hierarchical' => true,
 										'rewrite' => false,
 										'query_var' => false,
-										'supports' => array('post-thumbnails', 'page-attributes', 'custom-fields', 'comments', 'revisions')
+										'supports' => array('title', 'editor', 'thumbnail', 'page-attributes', 'custom-fields', 'comments', 'revisions')
 									) );
 
 	register_post_type( 'attachment', array('label' => __('Media'),
Index: wp-admin/edit-form-advanced.php
===================================================================
--- wp-admin/edit-form-advanced.php	(revision 13695)
+++ wp-admin/edit-form-advanced.php	(working copy)
@@ -106,10 +106,10 @@
 if ( post_type_supports($post_type, 'page-attributes') )
 	add_meta_box('pageparentdiv', __('Attributes'), 'page_attributes_meta_box', $post_type, 'side', 'core');
 
-if ( current_theme_supports( 'post-thumbnails', $post_type ) && post_type_supports($post_type, 'post-thumbnails') )
+if ( current_theme_supports( 'post-thumbnails', $post_type ) && post_type_supports($post_type, 'thumbnail') )
 	add_meta_box('postimagediv', __('Post Thumbnail'), 'post_thumbnail_meta_box', $post_type, 'side', 'low');
 
-if ( post_type_supports($post_type, 'excerpts') )
+if ( post_type_supports($post_type, 'excerpt') )
 	add_meta_box('postexcerpt', __('Excerpt'), 'post_excerpt_meta_box', $post_type, 'normal', 'core');
 
 if ( post_type_supports($post_type, 'trackbacks') )
@@ -184,6 +184,7 @@
 
 <div id="post-body">
 <div id="post-body-content">
+<?php if ( post_type_supports($post_type, 'title') ) { ?>
 <div id="titlediv">
 <div id="titlewrap">
 	<label class="screen-reader-text" for="title"><?php _e('Title') ?></label>
@@ -198,16 +199,19 @@
 
 if ( !( 'pending' == $post->post_status && !current_user_can( $post_type_object->publish_cap ) ) ) { ?>
 	<div id="edit-slug-box">
-<?php
-	if ( ! empty($post->ID) && ! empty($sample_permalink_html) && 'auto-draft' != $post->post_status ) :
-		echo $sample_permalink_html;
-endif; ?>
+	<?php
+		if ( ! empty($post->ID) && ! empty($sample_permalink_html) && 'auto-draft' != $post->post_status )
+			echo $sample_permalink_html;
+	?>
 	</div>
 <?php
-} ?>
+}
+?>
 </div>
 </div>
+<?php } ?>
 
+<?php if ( post_type_supports($post_type, 'editor') ) { ?>
 <div id="<?php echo user_can_richedit() ? 'postdivrich' : 'postdiv'; ?>" class="postarea">
 
 <?php the_editor($post->post_content); ?>
@@ -239,6 +243,7 @@
 </div>
 
 <?php
+}
 
 do_meta_boxes($post_type, 'normal', $post);
 
