diff --git a/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/model/ResponseCode.java b/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/model/ResponseCode.java
index 412da5aae1b..77271a6c72f 100644
--- a/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/model/ResponseCode.java
+++ b/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/model/ResponseCode.java
@@ -2,18 +2,25 @@ package com.wordnik.swagger.generator.model;
 
 public class ResponseCode {
   private String code;
+  private String link;
+  public ResponseCode() {}
+
+  public ResponseCode(String code, String link) {
+    setCode(code);
+    setLink(link);
+  }
 
   public String getCode() {
     return code;
   }
-
   public void setCode(String code) {
     this.code = code;
   }
 
-  public ResponseCode() {}
-
-  public ResponseCode(String code) {
-    setCode(code);
+  public String getLink() {
+    return link;
+  }
+  public void setLink(String link) {
+    this.link = link;
   }
 }
\ No newline at end of file
diff --git a/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/resource/SwaggerResource.java b/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/resource/SwaggerResource.java
index a57d800a665..2e3a480e115 100644
--- a/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/resource/SwaggerResource.java
+++ b/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/resource/SwaggerResource.java
@@ -34,8 +34,9 @@ public class SwaggerResource {
 
   @GET
   @Path("/download/{fileId}")
-  @Produces({"application/zip", "application/json"})
-  @ApiOperation(value = "Downloads a pre-generated file", response = File.class)
+  @Produces({"application/zip"})
+  @ApiOperation(value = "Downloads a pre-generated file",
+    response = String.class)
   public Response downloadFile(@PathParam("fileId") String fileId) throws Exception {
     Generated g = fileMap.get(fileId);
     System.out.println("looking for fileId " + fileId);
@@ -57,7 +58,8 @@ public class SwaggerResource {
   @POST
   @Path("/clients/{language}")
   @Produces({"application/zip", "application/json"})
-  @ApiOperation(value = "Generates a client library based on the config")
+  @ApiOperation(
+    value = "Generates a client library based on the config")
   public Response generateClient(
     @ApiParam(value = "The target language for the client library", allowableValues = "android,java,php,objc,docs", required = true) @PathParam("language") String language,
     @ApiParam(value = "Configuration for building the client library", required = true) GeneratorInput opts) throws Exception {
@@ -71,7 +73,8 @@ public class SwaggerResource {
       g.setFriendlyName(language + "-client");
       fileMap.put(code, g);
       System.out.println(code + ", " + filename);
-      return Response.ok().entity(new ResponseCode(code)).build();
+      String link = "http://generator.swagger.io/api/gen/download/" + code;
+      return Response.ok().entity(new ResponseCode(code, link)).build();
     }
     else {
       return Response.status(500).build();
@@ -120,7 +123,8 @@ public class SwaggerResource {
       g.setFriendlyName(framework + "-server");
       fileMap.put(code, g);
       System.out.println(code + ", " + filename);
-      return Response.ok().entity(new ResponseCode(code)).build();
+      String link = "http://generator.swagger.io/api/gen/download/" + code;
+      return Response.ok().entity(new ResponseCode(code, link)).build();
     }
     else {
       return Response.status(500).build();