diff --git a/NEWS b/NEWS
index a399ba26..b16ec46a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,4 @@
+  - change escape:url use rawurlencode() instead of urlencode() (messju)
   - make $smarty.const.FOO compile to "FOO", and not to "constant('foo')".
     this is less code and a little faster execution. note that undefined
     constants are now displayed as the constant's name. (messju)
diff --git a/libs/plugins/modifier.escape.php b/libs/plugins/modifier.escape.php
index 0a0270c5..a32a8766 100644
--- a/libs/plugins/modifier.escape.php
+++ b/libs/plugins/modifier.escape.php
@@ -28,7 +28,7 @@ function smarty_modifier_escape($string, $esc_type = 'html')
             return htmlentities($string, ENT_QUOTES);
 
         case 'url':
-            return urlencode($string);
+            return rawurlencode($string);
 
         case 'quotes':
             // escape unescaped single quotes