diff --git a/configuration/000-macros.conf b/configuration/000-macros.conf
index 29a0a42de29..aadf834596b 100755
--- a/configuration/000-macros.conf
+++ b/configuration/000-macros.conf
@@ -22,11 +22,11 @@
         AddOutputFilterByType DEFLATE application/javascript
         AddOutputFilterByType DEFLATE application/x-javascript
 
-        AllowEncodedSlashes On
+        AllowEncodedSlashes NoDecode
 </Macro>
 
 <Macro Rewrite $IP $PORT>
-        RewriteRule ^/(.*)$ http://$IP:$PORT/$1 [P,L]
+        ProxyPass "/" "http://$IP:$PORT/" nocanon
         ProxyPassReverse / http://$IP:$PORT/
 	ProxyPreserveHost On
 </Macro>