diff --git a/lib/Cake/Test/Case/View/Helper/TextHelperTest.php b/lib/Cake/Test/Case/View/Helper/TextHelperTest.php
index 87d81b14a0a..a38fa38f188 100644
--- a/lib/Cake/Test/Case/View/Helper/TextHelperTest.php
+++ b/lib/Cake/Test/Case/View/Helper/TextHelperTest.php
@@ -117,6 +117,10 @@ public function testEngineOverride() {
  * @return void
  */
 	public function testAutoLink() {
+		$text = 'The AWWWARD show happened today';
+		$result = $this->Text->autoLink($text);
+		$this->assertEquals($text, $result);
+
 		$text = 'This is a test text';
 		$expected = 'This is a test text';
 		$result = $this->Text->autoLink($text);
diff --git a/lib/Cake/View/Helper/TextHelper.php b/lib/Cake/View/Helper/TextHelper.php
index 2a2a536b49d..753434cc51f 100644
--- a/lib/Cake/View/Helper/TextHelper.php
+++ b/lib/Cake/View/Helper/TextHelper.php
@@ -114,7 +114,7 @@ public function autoLinkUrls($text, $options = array()) {
 			$text
 		);
 		$text = preg_replace_callback(
-			'#(?<!href="|">)(?<!\b[[:punct:]])(?<!http://|https://|ftp://|nntp://|//)www.[^\n\%\ <]+[^<\n\%\,\.\ <](?<!\))#i',
+			'#(?<!href="|">)(?<!\b[[:punct:]])(?<!http://|https://|ftp://|nntp://|//)www\.[^\n\%\ <]+[^<\n\%\,\.\ <](?<!\))#i',
 			array(&$this, '_insertPlaceHolder'),
 			$text
 		);