diff --git a/plugins/ShrinkUrl.py b/plugins/ShrinkUrl.py
index 442ff0c1c..7793a35e7 100644
--- a/plugins/ShrinkUrl.py
+++ b/plugins/ShrinkUrl.py
@@ -209,6 +209,7 @@ class ShrinkUrl(callbacks.PrivmsgCommandAndRegexp):
 
         Returns an ln-s.net version of <url>.
         """
+        url = webutils.urlquote(url)
         if len(url) < 17:
             irc.error('Stop being a lazy-biotch and type the URL yourself.')
             return
@@ -240,6 +241,7 @@ class ShrinkUrl(callbacks.PrivmsgCommandAndRegexp):
 
         Returns a TinyURL.com version of <url>
         """
+        url = webutils.urlquote(url)
         if len(url) < 20:
             irc.error('Stop being a lazy-biotch and type the URL yourself.')
             return