diff --git a/wp-includes/js/autosave.js.php b/wp-includes/js/autosave.js.php
index 7d2fe4e635..e1382aa1e8 100644
--- a/wp-includes/js/autosave.js.php
+++ b/wp-includes/js/autosave.js.php
@@ -14,6 +14,10 @@ function autosave_timer() {
 }
 
 function autosave_start_timer() {
+	var form = $('post');
+	if ( typeof tinyMCE != "undefined" || tinyMCE.configs.length > 0 )
+		tinyMCE.wpTriggerSave();
+	autosaveLast = form.post_title.value+form.content.value;
 	setTimeout("autosave_timer()", <?php echo apply_filters('autosave_start_delay', '60000') ?>);
 }
 addLoadEvent(autosave_start_timer)
diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
index 27e2bd3681..dc6c68e4d4 100644
--- a/wp-includes/script-loader.php
+++ b/wp-includes/script-loader.php
@@ -18,7 +18,7 @@ class WP_Scripts {
 		$this->add( 'tiny_mce', '/wp-includes/js/tinymce/tiny_mce_gzip.php', false, '08152006' );
 		$this->add( 'wp_tiny_mce', '/wp-includes/js/tinymce/tiny_mce_config.php', array('tiny_mce'), '04162006' );
 		$this->add( 'prototype', '/wp-includes/js/prototype.js', false, '1.5.0');
-		$this->add( 'autosave', '/wp-includes/js/autosave.js.php', array('prototype', 'sack'), '4101');
+		$this->add( 'autosave', '/wp-includes/js/autosave.js.php', array('prototype', 'sack'), '4102');
 		if ( is_admin() ) {
 			$this->add( 'dbx-admin-key', '/wp-admin/dbx-admin-key-js.php', array('dbx'), '3651' );
 			$this->add( 'listman', '/wp-admin/list-manipulation-js.php', array('sack', 'fat'), '4042' ); // Make changeset # the correct one