diff --git a/package.json b/package.json
index fcd09f71e4..b30307eec0 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
     "fuse.js": "^2.2.0",
     "glob": "^5.0.14",
     "highlight.js": "^8.9.1",
-    "linkifyjs": "2.0.0-beta.4",
+    "linkifyjs": "^2.1.0",
     "lodash": "^4.13.1",
     "marked": "^0.3.5",
     "matrix-js-sdk": "matrix-org/matrix-js-sdk#develop",
diff --git a/src/linkify-matrix.js b/src/linkify-matrix.js
index 99e4898182..1e93d8c387 100644
--- a/src/linkify-matrix.js
+++ b/src/linkify-matrix.js
@@ -42,7 +42,9 @@ function matrixLinkify(linkify) {
         TT.PLUS,
         TT.NUM,
         TT.DOMAIN,
-        TT.TLD
+        TT.TLD,
+        TT.UNDERSCORE,
+        TT.POUND,
     ];
 
     S_START.on(TT.POUND, S_HASH);