Index: wp-content/themes/classic/header.php
===================================================================
--- wp-content/themes/classic/header.php	(revision 5921)
+++ wp-content/themes/classic/header.php	(working copy)
@@ -6,8 +6,6 @@
 
 	<title><?php bloginfo('name'); ?><?php wp_title(); ?></title>
 
-	<meta name="generator" content="WordPress <?php bloginfo('version'); ?>" /> <!-- leave this for stats please -->
-
 	<style type="text/css" media="screen">
 		@import url( <?php bloginfo('stylesheet_url'); ?> );
 	</style>
Index: wp-content/themes/default/header.php
===================================================================
--- wp-content/themes/default/header.php	(revision 5921)
+++ wp-content/themes/default/header.php	(working copy)
@@ -6,8 +6,6 @@
 
 <title><?php bloginfo('name'); ?> <?php if ( is_single() ) { ?> &raquo; Blog Archive <?php } ?> <?php wp_title(); ?></title>
 
-<meta name="generator" content="WordPress <?php bloginfo('version'); ?>" /> <!-- leave this for stats -->
-
 <link rel="stylesheet" href="<?php bloginfo('stylesheet_url'); ?>" type="text/css" media="screen" />
 <link rel="alternate" type="application/rss+xml" title="<?php bloginfo('name'); ?> RSS Feed" href="<?php bloginfo('rss2_url'); ?>" />
 <link rel="pingback" href="<?php bloginfo('pingback_url'); ?>" />
Index: wp-includes/default-filters.php
===================================================================
--- wp-includes/default-filters.php	(revision 5921)
+++ wp-includes/default-filters.php	(working copy)
@@ -105,6 +105,8 @@
 add_filter('comment_email', 'antispambot');
 
 // Actions
+add_action('wp_head', 'wp_vanity');
+add_action('admin_head', 'wp_vanity');
 add_action('wp_head', 'rsd_link');
 add_action('wp_head', 'locale_stylesheet');
 add_action('publish_future_post', 'wp_publish_post', 10, 1);
Index: wp-includes/functions.php
===================================================================
--- wp-includes/functions.php	(revision 5921)
+++ wp-includes/functions.php	(working copy)
@@ -1343,6 +1343,10 @@
 	ksort($submenu['themes.php'], SORT_NUMERIC);
 }
 
+function wp_vanity() {
+    echo "<meta name='generator' content='WordPress " . get_bloginfo('version') . "' />\n";
+}
+
 // For PHP 5.2, make sure all output buffers are flushed
 // before our singletons our destroyed.
 function wp_ob_end_flush_all()