diff --git a/wp-comments-popup.php b/wp-comments-popup.php
index 2209aed358..89ae1b9bdc 100644
--- a/wp-comments-popup.php
+++ b/wp-comments-popup.php
@@ -53,7 +53,7 @@ if (!empty($commentstatus->post_password) && $HTTP_COOKIE_VARS['wp-postpass_'.$c
 
 <?php if ('open' == $commentstatus->comment_status) { ?>
 <h2>Leave a Comment</h2>
-<p>Line and paragraph breaks automatic, website trumps email, <acronym title="Hypertext Markup Language">HTML</acronym> allowed: <code><?php echo htmlentities(str_replace('<', ' <', $comment_allowed_tags)); ?></code></p>
+<p>Line and paragraph breaks automatic, website trumps email, <acronym title="Hypertext Markup Language">HTML</acronym> allowed: <code><?php echo allowed_tags(); ?></code></p>
 
 <form action="<?php echo $siteurl; ?>/wp-comments-post.php" method="post" id="commentform">
 	<p>
diff --git a/wp-comments.php b/wp-comments.php
index cb8770d8c2..4fbbaa32cd 100644
--- a/wp-comments.php
+++ b/wp-comments.php
@@ -44,7 +44,7 @@
 
 <h2>Leave a Comment</h2>
 <?php if ('open' == $post->comment_status) { ?>
-<p>Line and paragraph breaks automatic, website trumps email, <acronym title="Hypertext Markup Language">HTML</acronym> allowed: <code><?php echo htmlentities(str_replace('<', ' <', $comment_allowed_tags)); ?></code></p>
+<p>Line and paragraph breaks automatic, website trumps email, <acronym title="Hypertext Markup Language">HTML</acronym> allowed: <code><?php echo allowed_tags(); ?></code></p>
 
 <form action="<?php echo $siteurl; ?>/wp-comments-post.php" method="post" id="commentform">
 	<p>
diff --git a/wp-includes/kses.php b/wp-includes/kses.php
index e0b0d9ee0b..f9660a5566 100644
--- a/wp-includes/kses.php
+++ b/wp-includes/kses.php
@@ -18,10 +18,10 @@ $allowedtags = array('b' => array(),
 				 'abbr' => array('title'),
 				 'em' => array(),
 				 'strike' => array(),
-                 'a' => array('href'  => array('minlen' => 6, 'maxlen' => 250),
+                 'a' => array('href',
                               'title',
-							  'rel' => array('minlen' => 3, 'maxlen' => 250)),
-				'blockquote' => array('cite' => array()),
+							  'rel'),
+				'blockquote' => array('cite'),
 				'del' => array('datetime'),
                  'br' => array());
 
diff --git a/wp-includes/template-functions.php b/wp-includes/template-functions.php
index 33863f7659..8ed4cfaac3 100644
--- a/wp-includes/template-functions.php
+++ b/wp-includes/template-functions.php
@@ -1879,4 +1879,18 @@ function permalink_single_rss($file = '') {
 
 /***** // Permalink tags *****/
 
-?>
+function allowed_tags() {
+	global $allowedtags;
+	foreach($allowedtags as $tag => $attributes) {
+		$allowed .= "<$tag";
+		if (0 < count($attributes)) {
+			foreach ($attributes as $attribute) {
+				$allowed .= " $attribute=\"\"";
+			}
+		}
+		$allowed .= "> ";
+	}
+	return htmlentities($allowed);
+}
+
+?>
\ No newline at end of file