diff --git a/ChangeLog b/ChangeLog
index a8dc087ddcfc81e759d3625a63d08a9957b14364..7123422f16b4eaa36ec6088f6d7d7469d2f41553 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-04	Benedikt Meurer <benny@xfce.org>
+
+	* thunar-vfs/thunar-vfs-uri.c(escape): And of course, we need to escape
+	  the '+' and '%' characters in URIs.
+
 2005-09-04	Benedikt Meurer <benny@xfce.org>
 
 	* thunar-vfs/thunar-vfs-uri.c(escape): Also escape '&' in URIs.
diff --git a/thunar-vfs/thunar-vfs-uri.c b/thunar-vfs/thunar-vfs-uri.c
index c59698462b1a5c4d03eafa1d831015501230e4f2..7ae16e9c8d3ad9e72b60147f0642200a0f0b94f9 100644
--- a/thunar-vfs/thunar-vfs-uri.c
+++ b/thunar-vfs/thunar-vfs-uri.c
@@ -500,7 +500,7 @@ escape (const gchar *s,
 
   for (; n > 1 && *s != '\0'; ++s)
     {
-      if (G_LIKELY (*((const guchar *) s) > 32 && *((const guchar *) s) < 128 && *s != '&'))
+      if (G_LIKELY (*((const guchar *) s) > 32 && *((const guchar *) s) < 128 && *s != '&' && *s != '+' && *s != '%'))
         {
           *t++ = *s;
           --n;