Index: wp-includes/default-filters.php
===================================================================
--- wp-includes/default-filters.php	(revision 13997)
+++ wp-includes/default-filters.php	(working copy)
@@ -220,8 +220,6 @@
 add_action( 'shutdown',                   'wp_ob_end_flush_all',      1    );
 add_action( 'pre_post_update',            'wp_save_post_revision'          );
 add_action( 'publish_post',               '_publish_post_hook',       5, 1 );
-add_action( 'future_post',                '_future_post_hook',        5, 2 );
-add_action( 'future_page',                '_future_post_hook',        5, 2 );
 add_action( 'save_post',                  '_save_post_hook',          5, 2 );
 add_action( 'transition_post_status',     '_transition_post_status',  5, 3 );
 add_action( 'comment_form', 'wp_comment_form_unfiltered_html_nonce'        );
Index: wp-includes/post.php
===================================================================
--- wp-includes/post.php	(revision 13997)
+++ wp-includes/post.php	(working copy)
@@ -868,6 +868,8 @@
 
 	$wp_post_types[$post_type] = $args;
 
+	add_action( 'future_' . $post_type, '_future_post_hook', 5, 2 );
+
 	foreach ( $args->taxonomies as $taxonomy ) {
 		register_taxonomy_for_object_type( $taxonomy, $post_type );
 	}