Index: wp-admin/custom-header.php
===================================================================
--- wp-admin/custom-header.php	(revision 12687)
+++ wp-admin/custom-header.php	(working copy)
@@ -277,11 +277,19 @@
 <?php screen_icon(); ?>
 <h2><?php _e('Your Header Image'); ?></h2>
 <p><?php _e('This is your header image. You can change the text color or upload and crop a new image.'); ?></p>
+<?php
 
+$custom_header_template = apply_filters('custom_header_template', '');
+if ( $custom_header_template ) {
+  include $custom_header_template;
+} else {
+
+?>
 <div id="headimg" style="background-image: url(<?php esc_url(header_image()) ?>);">
 <h1><a onclick="return false;" href="<?php bloginfo('url'); ?>" title="<?php bloginfo('name'); ?>" id="name"><?php bloginfo('name'); ?></a></h1>
 <div id="desc"><?php bloginfo('description');?></div>
 </div>
+<?php } ?>
 <?php if ( !defined( 'NO_HEADER_TEXT' ) ) { ?>
 <form method="post" action="<?php echo admin_url('themes.php?page=custom-header&amp;updated=true') ?>">
 <input type="button" class="button" value="<?php esc_attr_e('Hide Text'); ?>" onclick="hide_text()" id="hidetext" />
@@ -455,14 +463,8 @@
 	 * @since unknown
 	 */
 	function finished() {
-		?>
-<div class="wrap">
-<h2><?php _e('Header complete!'); ?></h2>
-
-<p><?php _e('Visit your site and you should see the new header now.'); ?></p>
-
-</div>
-		<?php
+		$_GET['updated'] = 1;
+	  $this->step_1();
 	}
 
 	/**