diff --git a/addons/linkify/linkify.js b/addons/linkify/linkify.js
index 152404d4..8b222564 100644
--- a/addons/linkify/linkify.js
+++ b/addons/linkify/linkify.js
@@ -30,8 +30,10 @@
       negatedDomainCharacterSet = '[^\\da-z\\.-]+',
       domainBodyClause = '(' + domainCharacterSet + ')',
       tldClause = '([a-z\\.]{2,6})',
-      hostClause = domainBodyClause + '\\.' + tldClause,
-      pathClause = '([\\/\\w\\.-]*)*\\/?',
+      ipClause = '((\\d{1,3}\\.){3}\\d{1,3})',
+      portClause = '(:\\d{1,5})',
+      hostClause = '((' + domainBodyClause + '\\.' + tldClause + ')|(' + ipClause + portClause + '?))',
+      pathClause = '(\\/[\\/\\w\\.-]*)*',
       negatedPathCharacterSet = '[^\\/\\w\\.-]+',
       bodyClause = hostClause + pathClause,
       start = '(?:^|' + negatedDomainCharacterSet + ')(',
@@ -41,7 +43,6 @@
       lenientUrlRegex = new RegExp(lenientUrlClause),
       strictUrlRegex = new RegExp(strictUrlClause);
 
-
   /**
    * Converts all valid URLs found in the given terminal line into
    * hyperlinks. The terminal line can be either the HTML element itself