diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
index ebb9c731224..636f0157a52 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
@@ -43,7 +43,8 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig {
     protected String groupId = "io.swagger";
     protected String artifactId = "swagger-java-client";
     protected String artifactVersion = "1.0.0";
-    protected String sourceFolder = "src/main/java";
+    protected String projectFolder = "src" + File.separator + "main";
+    protected String sourceFolder = projectFolder + File.separator + "java";
     protected String localVariablePrefix = "";
     protected boolean fullJavaUtil = false;
     protected String javaUtilPrefix = "";
@@ -51,7 +52,7 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig {
 
     public JavaClientCodegen() {
         super();
-        outputFolder = "generated-code/java";
+        outputFolder = "generated-code" + File.separator + "java";
         modelTemplateFiles.put("model.mustache", ".java");
         apiTemplateFiles.put("api.mustache", ".java");
         embeddedTemplateDir = templateDir = "Java";
@@ -209,6 +210,7 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig {
         supportingFiles.add(new SupportingFile("build.gradle.mustache", "", "build.gradle"));
         supportingFiles.add(new SupportingFile("settings.gradle.mustache", "", "settings.gradle"));
         supportingFiles.add(new SupportingFile("gradle.properties.mustache", "", "gradle.properties"));
+        supportingFiles.add(new SupportingFile("manifest.mustache", projectFolder, "AndroidManifest.xml"));
         supportingFiles.add(new SupportingFile("ApiClient.mustache", invokerFolder, "ApiClient.java"));
         supportingFiles.add(new SupportingFile("StringUtil.mustache", invokerFolder, "StringUtil.java"));
 
diff --git a/modules/swagger-codegen/src/main/resources/Java/manifest.mustache b/modules/swagger-codegen/src/main/resources/Java/manifest.mustache
new file mode 100644
index 00000000000..f44bd07d0a0
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/Java/manifest.mustache
@@ -0,0 +1,3 @@
+<manifest package="{{invokerPackage}}" xmlns:android="http://schemas.android.com/apk/res/android">
+    <application />
+</manifest>
diff --git a/samples/client/petstore/java/default/src/main/AndroidManifest.xml b/samples/client/petstore/java/default/src/main/AndroidManifest.xml
new file mode 100644
index 00000000000..465dcb520c4
--- /dev/null
+++ b/samples/client/petstore/java/default/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/jersey2/src/main/AndroidManifest.xml b/samples/client/petstore/java/jersey2/src/main/AndroidManifest.xml
new file mode 100644
index 00000000000..465dcb520c4
--- /dev/null
+++ b/samples/client/petstore/java/jersey2/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/okhttp-gson/src/main/AndroidManifest.xml b/samples/client/petstore/java/okhttp-gson/src/main/AndroidManifest.xml
new file mode 100644
index 00000000000..465dcb520c4
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/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/retrofit/src/main/AndroidManifest.xml b/samples/client/petstore/java/retrofit/src/main/AndroidManifest.xml
new file mode 100644
index 00000000000..465dcb520c4
--- /dev/null
+++ b/samples/client/petstore/java/retrofit/src/main/AndroidManifest.xml
@@ -0,0 +1,3 @@
+<manifest package="io.swagger.client" xmlns:android="http://schemas.android.com/apk/res/android">
+    <application />
+</manifest>