diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/TemplateAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/TemplateAsyncClient.java
index b29e274f3c..dcb7968da9 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/TemplateAsyncClient.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/TemplateAsyncClient.java
@@ -87,7 +87,7 @@ public interface TemplateAsyncClient {
    @QueryParams(keys = "command", values = "registerTemplate")
    @SelectJson("template")
    @Consumes(MediaType.APPLICATION_JSON)
-   ListenableFuture<Template> registerTemplate(
+   ListenableFuture<Set<Template>> registerTemplate(
          @BinderParam(BindTemplateMetadataToQueryParams.class) TemplateMetadata templateMetadata,
          @QueryParam("format") String format, @QueryParam("hypervisor") String hypervisor,
          @QueryParam("url") String url, @QueryParam("zoneid") long zoneId, RegisterTemplateOptions... options);
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/TemplateClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/TemplateClient.java
index 9e134b19d9..62bcec601c 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/TemplateClient.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/TemplateClient.java
@@ -86,7 +86,7 @@ public interface TemplateClient {
     *           optional arguments
     * @return data about the newly-registered template
     */
-   Template registerTemplate(TemplateMetadata templateMetadata, String format, String hypervisor, String url,
+   Set<Template> registerTemplate(TemplateMetadata templateMetadata, String format, String hypervisor, String url,
          long zoneId, RegisterTemplateOptions... options);
 
    /**