diff --git a/bin/contrib/rc-httpd/handlers/dir-index b/bin/contrib/rc-httpd/handlers/dir-index
index 31e5b02..00ff8ce 100755
--- a/bin/contrib/rc-httpd/handlers/dir-index
+++ b/bin/contrib/rc-httpd/handlers/dir-index
@@ -1,5 +1,5 @@
 #!/bin/rc
-PATH_INFO=`{echo $PATH_INFO | urlencode -d}
+PATH_INFO=`{echo $PATH_INFO | urldecode.awk}
 full_path=$"FS_ROOT^$"PATH_INFO
 full_path=$"full_path
 if(! test -d $full_path){
diff --git a/bin/contrib/rc-httpd/handlers/serve-static b/bin/contrib/rc-httpd/handlers/serve-static
index 43c5f7a..00cc70a 100755
--- a/bin/contrib/rc-httpd/handlers/serve-static
+++ b/bin/contrib/rc-httpd/handlers/serve-static
@@ -1,5 +1,5 @@
 #!/bin/rc
-full_path=`{echo $"FS_ROOT^$"PATH_INFO | urlencode -d}
+full_path=`{echo $"FS_ROOT^$"PATH_INFO | urldecode.awk}
 full_path=$"full_path
 if(~ $full_path */)
 	error 503