diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index dcf07d63b..2f16b101c 100644
--- a/builds/4chan-X.user.js
+++ b/builds/4chan-X.user.js
@@ -4422,7 +4422,7 @@
       if (g.VIEW === 'catalog' || !Conf['Linkify']) {
         return;
       }
-      this.regString = /((https?|mailto|git|magnet|ftp|irc):([a-z\d%\/])|www\d{0,3}[.]|[-a-z\d.]+[.](com|net|org|jp|us|uk|ru|be|tv|xxx|edu|gov|cd|es|de|se|tk|dk|io|fm|fi|mp|ly|info)(?![\d\w])|[\d]{1,3}\.[\d]{1,3}\.[\d]{1,3}\.[\d]{1,3}|[-\w\d.@]+@[a-z\d.-]+\.[a-z\d])/i;
+      this.regString = /((https?|mailto|git|magnet|ftp|irc):([a-z\d%\/])|[-a-z\d.]+[.](aero|asia|biz|cat|com|coop|info|int|jobs|mobi|museum|name|net|org|post|pro|tel|travel|xxx|edu|gov|mil|[\d]{1,3}|[a-z]{2})(\/|\z)|[-\w\d.@]+@[a-z\d.-]+\.[a-z\d])/i;
       if (Conf['Comment Expansion']) {
         ExpandComment.callbacks.push(this.node);
       }
diff --git a/builds/crx/script.js b/builds/crx/script.js
index e494f5160..5772a0b91 100644
--- a/builds/crx/script.js
+++ b/builds/crx/script.js
@@ -4431,7 +4431,7 @@
       if (g.VIEW === 'catalog' || !Conf['Linkify']) {
         return;
       }
-      this.regString = /((https?|mailto|git|magnet|ftp|irc):([a-z\d%\/])|www\d{0,3}[.]|[-a-z\d.]+[.](com|net|org|jp|us|uk|ru|be|tv|xxx|edu|gov|cd|es|de|se|tk|dk|io|fm|fi|mp|ly|info)(?![\d\w])|[\d]{1,3}\.[\d]{1,3}\.[\d]{1,3}\.[\d]{1,3}|[-\w\d.@]+@[a-z\d.-]+\.[a-z\d])/i;
+      this.regString = /((https?|mailto|git|magnet|ftp|irc):([a-z\d%\/])|[-a-z\d.]+[.](aero|asia|biz|cat|com|coop|info|int|jobs|mobi|museum|name|net|org|post|pro|tel|travel|xxx|edu|gov|mil|[\d]{1,3}|[a-z]{2})(\/|\z)|[-\w\d.@]+@[a-z\d.-]+\.[a-z\d])/i;
       if (Conf['Comment Expansion']) {
         ExpandComment.callbacks.push(this.node);
       }
diff --git a/src/Linkification/Linkify.coffee b/src/Linkification/Linkify.coffee
index b37b19af2..c86728593 100755
--- a/src/Linkification/Linkify.coffee
+++ b/src/Linkification/Linkify.coffee
@@ -9,16 +9,10 @@ Linkify =
           [a-z\d%/]
         )
         |
-        www\d{0,3}[.]
-        |
-        # This should account for virtually all links posted without www or http:
-        # If it misses any, screw it. No, I will not add canv.as
+        # This should account for virtually all links posted without www or http:, including IPv4 addresses
         [-a-z\d.]+[.](
-          com|net|org|jp|us|uk|ru|be|tv|xxx|edu|gov|cd|es|de|se|tk|dk|io|fm|fi|mp|ly|info
-        )(?![\d\w])
-        |
-        # IPv4 Addresses
-        [\d]{1,3}\.[\d]{1,3}\.[\d]{1,3}\.[\d]{1,3}
+          aero|asia|biz|cat|com|coop|info|int|jobs|mobi|museum|name|net|org|post|pro|tel|travel|xxx|edu|gov|mil|[\d]{1,3}|[a-z]{2}
+        )(/|\z)
         |
         # E-mails
         [-\w\d.@]+@[a-z\d.-]+\.[a-z\d]