diff --git a/ba-linkify.js b/ba-linkify.js
index 81dae5f..4bf27ef 100644
--- a/ba-linkify.js
+++ b/ba-linkify.js
@@ -98,7 +98,7 @@ window.linkify = (function(){
     
     default_options = {
       callback: function( text, href ) {
-        return href ? '<a href="' + href + '" title="' + href + '">' + text + '</a>' : text;
+        return href ? '<a href="' + encodeURI(href) + '" title="' + encodeURI(href) + '">' + text + '</a>' : text;
       },
       punct_regexp: /(?:[!?.,:;'"]|(?:&|&amp;)(?:lt|gt|quot|apos|raquo|laquo|rsaquo|lsaquo);)$/
     };
@@ -211,4 +211,4 @@ window.linkify = (function(){
     return html || txt;
   };
   
-})();
\ No newline at end of file
+})();