diff --git a/wp-admin/admin-footer.php b/wp-admin/admin-footer.php
index 6e130ade57..293f8a1460 100644
--- a/wp-admin/admin-footer.php
+++ b/wp-admin/admin-footer.php
@@ -4,6 +4,6 @@
      printf(__('%s seconds'), number_format(timer_stop(), 2));
 ?>
 </p>
-
+<?php do_action('admin_footer', ''); ?>
 </body>
 </html>
\ No newline at end of file
diff --git a/wp-admin/admin-functions.php b/wp-admin/admin-functions.php
index f0f78826c1..48873785ec 100644
--- a/wp-admin/admin-functions.php
+++ b/wp-admin/admin-functions.php
@@ -1,9 +1,5 @@
 <?php
 
-function wp_admin_head() {
-	do_action('wp_head', '');
-}
-
 function url_shorten ($url) {
 	$short_url = str_replace('http://', '', stripslashes($url));
 	$short_url = str_replace('www.', '', $short_url);
diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php
index 248d74bcc4..4ddbd362c9 100644
--- a/wp-admin/admin-header.php
+++ b/wp-admin/admin-header.php
@@ -130,7 +130,7 @@ window.onload = blurry;
 </script>
 <?php endif; ?>
 
-<?php wp_admin_head(); ?>
+<?php do_action('admin_head', ''); ?>
 </head>
 <body>
 <div id="wphead">
diff --git a/wp-content/plugins/hello.php b/wp-content/plugins/hello.php
index b9002fa1b4..bf86344f7e 100644
--- a/wp-content/plugins/hello.php
+++ b/wp-content/plugins/hello.php
@@ -2,12 +2,71 @@
 /*
 Plugin Name: Hello Dolly
 Plugin URI: http://wordpress.org/#
-Description: This is not just a plugin, it symbolizes the hope and enthusiasm of an entire generation summed up in two words sung most famously by Louis Armstrong. Hello, Dolly. This is, by the way, the world's first official WordPress plugin. When enabled you will randomly see a lyric from <cite>Hello, Dolly</cite> in the upper right of your admin screen.
+Description: This is not just a plugin, it symbolizes the hope and enthusiasm of an entire generation summed up in two words sung most famously by Louis Armstrong. Hello, Dolly. This is, by the way, the world's first official WordPress plugin. When enabled you will randomly see a lyric from <cite>Hello, Dolly</cite> in the upper right of your admin screen on every page but the plugins page.
 Author: Matt Mullenweg
 Author URI: http://photomatt.net/
 */ 
 
+// These are the lyrics to Hello Dolly
+$lyrics = "Hello, Dolly
+Well, hello, Dolly
+It's so nice to have you back where you belong
+You're lookin' swell, Dolly
+I can tell, Dolly
+You're still glowin', you're still crowin'
+You're still goin' strong
+We feel the room swayin'
+While the band's playin'
+One of your old favourite songs from way back when
+So, take her wrap, fellas
+Find her an empty lap, fellas
+Dolly'll never go away again
+Hello, Dolly
+Well, hello, Dolly
+It's so nice to have you back where you belong
+You're lookin' swell, Dolly
+I can tell, Dolly
+You're still glowin', you're still crowin'
+You're still goin' strong
+We feel the room swayin'
+While the band's playin'
+One of your old favourite songs from way back when
+Golly, gee, fellas
+Find her a vacant knee, fellas
+Dolly'll never go away
+Dolly'll never go away
+Dolly'll never go away again";
+
+// Here we split it into lines
+$lyrics = explode("\n", $lyrics);
+// And then randomly choose a line
+$chosen = wptexturize( $lyrics[ mt_rand(0, count($lyrics) ) ] );
+
+// This just echoes the chosen line, we'll position it later
 function hello_dolly() {
-	echo "It's me, Dolly.";
+	global $chosen;
+	echo "<p id='dolly'>$chosen</p>";
 }
+
+// Now we set that function up to execute when the admin_footer action is called
+add_action('admin_footer', 'hello_dolly');
+
+// We need some CSS to position the paragraph
+function dolly_css() {
+	echo "
+	<style type='text/css'>
+	#dolly {
+		position: absolute;
+		top: 5px;
+margin: 0; padding: 0;
+		right: 3em;
+		font-size: 20px;
+		color: #666;
+	}
+	</style>
+	";
+}
+
+add_action('admin_head', 'dolly_css');
+
 ?>
\ No newline at end of file
