diff --git a/common.go b/common.go
index 7b2c05f..32ae3bd 100644
--- a/common.go
+++ b/common.go
@@ -242,7 +242,8 @@ var now = func() time.Time {
 func normuri(uri string) string {
 	parts := strings.Split(uri, "/")
 	for i := range parts {
-		parts[i] = url.QueryEscape(parts[i])
+		u := &url.URL{Path: parts[i]}
+		parts[i] = u.String()
 	}
 	return strings.Join(parts, "/")
 }