diff --git a/bin/java-petstore-feign.json b/bin/java-petstore-feign.json
new file mode 100644
index 000000000000..5502ee3bbad2
--- /dev/null
+++ b/bin/java-petstore-feign.json
@@ -0,0 +1,4 @@
+{
+    "library": "feign",
+    "artifactId": "swagger-petstore-feign"
+}
diff --git a/bin/java-petstore-feign.sh b/bin/java-petstore-feign.sh
new file mode 100755
index 000000000000..6f0a5fdf8ff5
--- /dev/null
+++ b/bin/java-petstore-feign.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+SCRIPT="$0"
+
+while [ -h "$SCRIPT" ] ; do
+  ls=`ls -ld "$SCRIPT"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '/.*' > /dev/null; then
+    SCRIPT="$link"
+  else
+    SCRIPT=`dirname "$SCRIPT"`/"$link"
+  fi
+done
+
+if [ ! -d "${APP_DIR}" ]; then
+  APP_DIR=`dirname "$SCRIPT"`/..
+  APP_DIR=`cd "${APP_DIR}"; pwd`
+fi
+
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
+
+if [ ! -f "$executable" ]
+then
+  mvn clean package
+fi
+
+# if you've executed sbt assembly previously it will use that instead.
+export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l java -c bin/java-petstore-feign.json -o samples/client/petstore/java/feign"
+
+java $JAVA_OPTS -jar $executable $ags
diff --git a/samples/client/petstore/java/feign/README.md b/samples/client/petstore/java/feign/README.md
index 8afc37518fc7..3ca7abfb5573 100644
--- a/samples/client/petstore/java/feign/README.md
+++ b/samples/client/petstore/java/feign/README.md
@@ -1,4 +1,4 @@
-# swagger-java-client
+# swagger-petstore-feign
 
 ## Requirements
 
@@ -25,7 +25,7 @@ After the client libarary is installed/deployed, you can use it in your Maven pr
 ```xml
 <dependency>
     <groupId>io.swagger</groupId>
-    <artifactId>swagger-java-client</artifactId>
+    <artifactId>swagger-petstore-feign</artifactId>
     <version>1.0.0</version>
     <scope>compile</scope>
 </dependency>
diff --git a/samples/client/petstore/java/feign/pom.xml b/samples/client/petstore/java/feign/pom.xml
index 967bdabcc6bc..5f7e95518625 100644
--- a/samples/client/petstore/java/feign/pom.xml
+++ b/samples/client/petstore/java/feign/pom.xml
@@ -2,9 +2,9 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.swagger</groupId>
-  <artifactId>swagger-java-client</artifactId>
+  <artifactId>swagger-petstore-feign</artifactId>
   <packaging>jar</packaging>
-  <name>swagger-java-client</name>
+  <name>swagger-petstore-feign</name>
   <version>1.0.0</version>
   <scm>
     <connection>scm:git:git@github.com:swagger-api/swagger-mustache.git</connection>
diff --git a/samples/client/petstore/java/feign/settings.gradle b/samples/client/petstore/java/feign/settings.gradle
index 55640f75122e..a25109c126eb 100644
--- a/samples/client/petstore/java/feign/settings.gradle
+++ b/samples/client/petstore/java/feign/settings.gradle
@@ -1 +1 @@
-rootProject.name = "swagger-java-client"
\ No newline at end of file
+rootProject.name = "swagger-petstore-feign"
\ No newline at end of file
diff --git a/samples/client/petstore/java/feign/src/main/AndroidManifest.xml b/samples/client/petstore/java/feign/src/main/AndroidManifest.xml
new file mode 100644
index 000000000000..465dcb520c40
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/AndroidManifest.xml
@@ -0,0 +1,3 @@
+<manifest package="io.swagger.client" xmlns:android="http://schemas.android.com/apk/res/android">
+    <application />
+</manifest>
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/StringUtil.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/StringUtil.java
index b0704ea88ca9..82b8d8afa0bf 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/StringUtil.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/StringUtil.java
@@ -1,6 +1,6 @@
 package io.swagger.client;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-12-07T01:11:21.159-05:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-12-01T16:10:23.565+08:00")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/PetApi.java
index e4fe4e4e2bf9..e2e7e6ce742a 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/PetApi.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/PetApi.java
@@ -10,9 +10,7 @@ import io.swagger.client.model.Pet;
 import java.io.File;
 import io.swagger.client.model.ApiResponse;
 
-
 import java.util.*;
-
 import feign.*;
 
 @javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-12-07T01:11:21.159-05:00")