diff --git a/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java b/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java
index 8fdbb4313f..352e032ca2 100644
--- a/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java
+++ b/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java
@@ -573,7 +573,9 @@ public class RestAnnotationProcessor implements Function<Invocation, HttpRequest
          return null;
       if (original.getHost() != null)
          return original;
-      return withHost.resolve(original);
+      String host = withHost.toString();
+      URI baseURI = host.endsWith("/") ? withHost : URI.create(host + "/");
+      return baseURI.resolve(original);
    }
 
    private org.jclouds.rest.MapBinder getMapPayloadBinderOrNull(Invocation invocation) {
diff --git a/core/src/test/java/org/jclouds/rest/internal/RestAnnotationProcessorTest.java b/core/src/test/java/org/jclouds/rest/internal/RestAnnotationProcessorTest.java
index 73355ad608..e2d7eb2687 100644
--- a/core/src/test/java/org/jclouds/rest/internal/RestAnnotationProcessorTest.java
+++ b/core/src/test/java/org/jclouds/rest/internal/RestAnnotationProcessorTest.java
@@ -2679,6 +2679,13 @@ public class RestAnnotationProcessorTest extends BaseRestApiTest {
       assertEquals(new URI("http://foo/bar"), result);
    }
 
+   @Test
+   public void testComplexHost() throws Exception {
+      URI result = RestAnnotationProcessor.addHostIfMissing(new URI("bar"), new URI("http://foo/foobar"));
+      assertEquals(new URI("http://foo/foobar/bar"), result);
+   }
+
+
    DateService dateService = new SimpleDateFormatDateService();
    RestAnnotationProcessor processor;
    TransformerForRequest transformer;