diff --git a/pyircbot/modules/LinkTitler.py b/pyircbot/modules/LinkTitler.py
index d8a90cb..1729c2f 100755
--- a/pyircbot/modules/LinkTitler.py
+++ b/pyircbot/modules/LinkTitler.py
@@ -79,7 +79,8 @@ class LinkTitler(ModuleBase):
# subreddits
# generic
- matches = re.compile(r'(https?://([a-zA-Z0-9_\-\.]+/([^ ]+)?))').findall(trailing)
+ matches = re.compile(r'(https?://([a-zA-Z0-9_\-\.]+/([A-Za-z0-9\-\._~:\/?#[]@!$&\'\(\)\*\+\,\;=]+)?))') \
+ .findall(trailing)
if matches:
done = []
for match in matches: