diff --git a/core/src/main/java/feign/RequestTemplate.java b/core/src/main/java/feign/RequestTemplate.java
index 2024ccb29..f99ff8b1f 100644
--- a/core/src/main/java/feign/RequestTemplate.java
+++ b/core/src/main/java/feign/RequestTemplate.java
@@ -518,7 +518,7 @@ public RequestTemplate target(String target) {
       }
 
       /* strip the query string */
-      this.target = targetUri.getScheme() + "://" + targetUri.getAuthority() + targetUri.getPath();
+      this.target = targetUri.getScheme() + "://" + targetUri.getRawAuthority() + targetUri.getRawPath();
       if (targetUri.getFragment() != null) {
         this.fragment = "#" + targetUri.getFragment();
       }