diff --git a/wp-includes/template-functions-general.php b/wp-includes/template-functions-general.php
index ab388f82c5..ff96256f67 100644
--- a/wp-includes/template-functions-general.php
+++ b/wp-includes/template-functions-general.php
@@ -62,7 +62,7 @@ function wp_meta() {
 
 function bloginfo($show='') {
 	$info = get_bloginfo($show);
-	if ( ! strstr($info, 'url') ) {
+	if ( ! (strstr($info, 'url') || strstr($info, 'directory')) ) {
 		$info = apply_filters('bloginfo', $info, $show);
 		$info = convert_chars($info);
 	}