Index: wordpress/wp-includes/canonical.php
--- wordpress/wp-includes/canonical.php.orig	2010-05-26 21:56:26.000000000 +0200
+++ wordpress/wp-includes/canonical.php	2010-06-18 08:45:53.000000000 +0200
@@ -256,6 +256,12 @@
 	if ( empty($user_home['path']) )
 		$user_home['path'] = '/';
 
+	// SHAMELESS HACK TO MAKE WORDPRESS THINK IT IS RUNNING UNDER PORT 80
+	// TO FIX THE URL TROUBLE WITH THE USUAL FRONTEND APACHE WEBSERVER! --rse
+	$user_home['port'] = 80;
+	$redirect['port'] = 80;
+	$original['port'] = 80;
+
 	// Handle ports
 	if ( !empty($user_home['port']) )
 		$redirect['port'] = $user_home['port'];
Index: wordpress/wp-login.php
--- wordpress/wp-login.php.orig	2010-06-01 17:54:00.000000000 +0200
+++ wordpress/wp-login.php	2010-06-18 08:47:30.000000000 +0200
@@ -187,7 +187,7 @@
 		$wpdb->update($wpdb->users, array('user_activation_key' => $key), array('user_login' => $user_login));
 	}
 	$message = __('Someone has asked to reset the password for the following site and username.') . "\r\n\r\n";
-	$message .= network_site_url() . "\r\n\r\n";
+	$message .= sprintf(__('Website:  %s'), network_site_url()) . "\r\n";
 	$message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n";
 	$message .= __('To reset your password visit the following address, otherwise just ignore this email and nothing will happen.') . "\r\n\r\n";
 	$message .= network_site_url("wp-login.php?action=rp&key=$key&login=" . rawurlencode($user_login), 'login') . "\r\n";
Index: wordpress/wp-mail.php
--- wordpress/wp-mail.php.orig	2010-05-26 04:42:15.000000000 +0200
+++ wordpress/wp-mail.php	2010-06-18 08:45:53.000000000 +0200
@@ -164,6 +164,7 @@
 		// Author not found in DB, set status to pending.  Author already set to admin.
 		$post_status = 'pending';
 	}
+	$post_status = 'draft';
 
 	$subject = trim($subject);
 
Index: wp-hashcash/wp-hashcash.php
--- wp-hashcash/wp-hashcash.php.orig	2008-07-30 10:07:06.000000000 +0200
+++ wp-hashcash/wp-hashcash.php	2010-06-18 08:45:53.000000000 +0200
@@ -521,7 +521,6 @@
 	}
 	
 	echo '<div><input type="hidden" id="wphc_value" name="wphc_value" value=""/></div>';
-	echo '<p>' . __('Powered by', 'wp-hashcash') . ' <a href="http://wordpress-plugins.feifei.us/hashcash/">WP Hashcash</a></p>';
 	echo '<noscript><div><small>Wordpress Hashcash needs javascript to work, but your browser has javascript disabled. Your comment will be '.$verb.'!</small></div></noscript>';
 }