Index: wp-includes/default-filters.php
===================================================================
--- wp-includes/default-filters.php	(revision 15375)
+++ wp-includes/default-filters.php	(working copy)
@@ -87,8 +87,9 @@
 }
 
 // Format WordPress
-foreach ( array( 'the_content', 'the_title', 'comment_text' ) as $filter )
-	add_filter( $filter, 'capital_P_dangit' );
+foreach ( array( 'the_content', 'comment_text' ) as $filter )
+	add_filter( $filter, 'capital_P_gosh_dangit', 11 );
+add_filter( 'the_title', 'capital_P_dangit' );
 
 // Format titles
 foreach ( array( 'single_post_title', 'single_cat_title', 'single_tag_title', 'single_month_title', 'nav_menu_attr_title', 'nav_menu_description' ) as $filter ) {
Index: wp-includes/formatting.php
===================================================================
--- wp-includes/formatting.php	(revision 15375)
+++ wp-includes/formatting.php	(working copy)
@@ -2820,13 +2820,33 @@
 
 /**
  * Forever eliminate "Wordpress" from the planet (or at least the little bit we can influence).
+ * Replaces all instances.
  *
  * Violating our coding standards for a good function name.
  *
  * @since 3.0.0
  */
+
 function capital_P_dangit( $text ) {
 	return str_replace( 'Wordpress', 'WordPress', $text );
 }
 
+/**
+ * Forever eliminate "Wordpress" from the planet (or at least the little bit we can influence).
+ * More selective version that tries to avoid cases where a URL might be bungled.
+ *
+ * Violating our coding standards for a good function name.
+ *
+ * @since 3.0.1
+ */
+function capital_P_gosh_dangit( $text ) {
+	static $dblq = false;
+	if ( false === $dblq )
+		$dblq = _x('“', 'opening curly quote');
+	return str_replace(
+		array( ' Wordpress', '‘Wordpress', $dblq . 'Wordpress', '>Wordpress', '(Wordpress' ),
+		array( ' WordPress', '‘WordPress', $dblq . 'WordPress', '>WordPress', '(WordPress' ),
+	$text );
+}
+
 ?>