diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index 1c9921a78e..91abc1eeaf 100644
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -274,7 +274,11 @@ require_once('./admin-header.php');
 
 <div class="wrap">
 <?php screen_icon(); ?>
-<h2><?php echo esc_html( $title ); ?><?php if ( isset( $post_new_file ) ) : ?> <a href="<?php echo esc_url( $post_new_file ) ?>" class="add-new-h2"><?php echo esc_html($post_type_object->labels->add_new); ?></a><?php endif; ?></h2>
+<h2><?php
+echo esc_html( $title );
+if ( isset( $post_new_file ) && current_user_can( $post_type_object->cap->create_posts ) )
+	echo ' <a href="' . esc_url( $post_new_file ) . '" class="add-new-h2">' . esc_html( $post_type_object->labels->add_new ) . '</a>';
+?></h2>
 <?php if ( $notice ) : ?>
 <div id="notice" class="error"><p><?php echo $notice ?></p></div>
 <?php endif; ?>
diff --git a/wp-admin/edit.php b/wp-admin/edit.php
index 5ba8972f46..9eae3cf395 100644
--- a/wp-admin/edit.php
+++ b/wp-admin/edit.php
@@ -221,10 +221,13 @@ require_once('./admin-header.php');
 ?>
 <div class="wrap">
 <?php screen_icon(); ?>
-<h2><?php echo esc_html( $post_type_object->labels->name ); ?> <a href="<?php echo $post_new_file ?>" class="add-new-h2"><?php echo esc_html($post_type_object->labels->add_new); ?></a> <?php
+<h2><?php
+echo esc_html( $post_type_object->labels->name );
+if ( current_user_can( $post_type_object->cap->create_posts ) )
+	echo ' <a href="' . esc_url( $post_new_file ) . '" class="add-new-h2">' . esc_html( $post_type_object->labels->add_new ) . '</a>';
 if ( ! empty( $_REQUEST['s'] ) )
-	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', get_search_query() ); ?>
-</h2>
+	printf( ' <span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', get_search_query() );
+?></h2>
 
 <?php if ( isset( $_REQUEST['locked'] ) || isset( $_REQUEST['updated'] ) || isset( $_REQUEST['deleted'] ) || isset( $_REQUEST['trashed'] ) || isset( $_REQUEST['untrashed'] ) ) {
 	$messages = array();
diff --git a/wp-admin/index.php b/wp-admin/index.php
index 4047247385..d0a013191b 100644
--- a/wp-admin/index.php
+++ b/wp-admin/index.php
@@ -76,7 +76,7 @@ if ( current_user_can( 'moderate_comments' ) )
 	$help .= '<p>' . __('<strong>Recent Comments</strong> - Shows the most recent comments on your posts (configurable, up to 30) and allows you to moderate them.') . '</p>';
 if ( current_user_can( 'publish_posts' ) )
 	$help .= '<p>' . __('<strong>Incoming Links</strong> - Shows links to your site found by Google Blog Search.') . '</p>';
-if ( current_user_can( 'edit_posts' ) ) {
+if ( current_user_can( 'create_posts' ) ) {
 	$help .= '<p>' . __('<strong>QuickPress</strong> - Allows you to create a new post and either publish it or save it as a draft.') . '</p>';
 	$help .= '<p>' . __('<strong>Recent Drafts</strong> - Displays links to the 5 most recent draft posts you&#8217;ve started.') . '</p>';
 }
diff --git a/wp-admin/post-new.php b/wp-admin/post-new.php
index deb41907e2..f5b9097bcb 100644
--- a/wp-admin/post-new.php
+++ b/wp-admin/post-new.php
@@ -36,7 +36,7 @@ $title = $post_type_object->labels->add_new_item;
 
 $editing = true;
 
-if ( ! current_user_can( $post_type_object->cap->edit_posts ) )
+if ( ! current_user_can( $post_type_object->cap->edit_posts ) || ! current_user_can( $post_type_object->cap->create_posts ) )
 	wp_die( __( 'Cheatin&#8217; uh?' ) );
 
 // Schedule auto-draft cleanup
diff --git a/wp-admin/press-this.php b/wp-admin/press-this.php
index e3660be25f..d5282b5a79 100644
--- a/wp-admin/press-this.php
+++ b/wp-admin/press-this.php
@@ -13,7 +13,7 @@ require_once('./admin.php');
 
 header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
 
-if ( ! current_user_can('edit_posts') )
+if ( ! current_user_can( 'edit_posts' ) || ! current_user_can( 'create_posts' ) )
 	wp_die( __( 'Cheatin&#8217; uh?' ) );
 
 /**
diff --git a/wp-includes/post.php b/wp-includes/post.php
index febc33384a..7c2020df55 100644
--- a/wp-includes/post.php
+++ b/wp-includes/post.php
@@ -1411,8 +1411,6 @@ function get_post_type_capabilities( $args ) {
 		'edit_others_posts'  => 'edit_others_'  . $plural_base,
 		'publish_posts'      => 'publish_'      . $plural_base,
 		'read_private_posts' => 'read_private_' . $plural_base,
-		// Post creation capability simply maps to edit_posts by default:
-		'create_posts'       => 'edit_'         . $plural_base,
 	);
 
 	// Primitive capabilities used within map_meta_cap():
@@ -1431,6 +1429,10 @@ function get_post_type_capabilities( $args ) {
 
 	$capabilities = array_merge( $default_capabilities, $args->capabilities );
 
+	// Post creation capability simply maps to edit_posts by default:
+	if ( ! isset( $capabilities['create_posts'] ) )
+		$capabilities['create_posts'] = $capabilities['edit_posts'];
+
 	// Remember meta capabilities for future reference.
 	if ( $args->map_meta_cap )
 		_post_type_meta_capabilities( $capabilities );