diff --git a/src/main/java/com/google/gwtexpui/safehtml/client/SafeHtml.java b/src/main/java/com/google/gwtexpui/safehtml/client/SafeHtml.java
index 4c61588..b19ad6c 100644
--- a/src/main/java/com/google/gwtexpui/safehtml/client/SafeHtml.java
+++ b/src/main/java/com/google/gwtexpui/safehtml/client/SafeHtml.java
@@ -70,13 +70,15 @@
 
   /** Convert bare http:// and https:// URLs into &lt;a href&gt; tags. */
   public SafeHtml linkify() {
+    final String part = "(?:" +
+		"[a-zA-Z0-9$_.+!*',%;:@=?#/-]" +
+		"|&(?!lt;|gt;)" +
+		")";
     return replaceAll(
         "(https?://" +
-          "[a-zA-Z0-9$_.+!*',%;:@&=?#/-]{2,}" +
-          "([(]" +
-          "[a-zA-Z0-9$_.+!*',%;:@&=?#/-]*" +
-          "[)])*" +
-          "[a-zA-Z0-9$_.+!*',%;:@&=?#/-]*" +
+          part + "{2,}" +
+          "(?:[(]" + part + "*" + "[)])*" +
+          part + "*" +
         ")",
         "<a href=\"$1\">$1</a>");
   }