diff --git a/src/main/resources/handlebars/Java/libraries/retrofit2/api.mustache b/src/main/resources/handlebars/Java/libraries/retrofit2/api.mustache
index ccfe0df071..32dc5dc7d1 100644
--- a/src/main/resources/handlebars/Java/libraries/retrofit2/api.mustache
+++ b/src/main/resources/handlebars/Java/libraries/retrofit2/api.mustache
@@ -48,14 +48,17 @@ public interface {{classname}} {
   {{/@first}}
   {{/formParams}}
   {{^formParams}}
-  {{#prioritizedContentTypes}}
-  {{#@first}}
   @Headers({
-    "Content-Type:{{mediaType}}"
-  })
-  {{/@first}}
+  {{#prioritizedContentTypes}}
+    {{#@first}}
+    "Content-Type:{{mediaType}}"{{#hasProduces}},{{/hasProduces}}
+    {{/@first}}
   {{/prioritizedContentTypes}}
-  {{/formParams}}  
+  {{#hasProduces}}
+    "Accept:{{#produces}}{{{mediaType}}}{{#hasMore}}, {{/hasMore}}{{/produces}}"
+  {{/hasProduces}}
+  })
+  {{/formParams}}
   @{{httpMethod}}("{{{path}}}")
   {{^doNotUseRx}}Observable{{/doNotUseRx}}{{#doNotUseRx}}Call{{/doNotUseRx}}<{{#isResponseFile}}ResponseBody{{/isResponseFile}}{{^isResponseFile}}{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Object{{/returnType}}{{/isResponseFile}}> {{operationId}}({{^parameters}});{{/parameters}}
     {{#parameters}}{{>libraries/retrofit2/queryParams}}{{>libraries/retrofit2/pathParams}}{{>libraries/retrofit2/headerParams}}{{>libraries/retrofit2/bodyParams}}{{>libraries/retrofit2/formParams}}{{>libraries/retrofit2/cookieParams}}{{#has this 'more'}}, {{/has}}{{#hasNot this 'more'}}
diff --git a/src/main/resources/handlebars/Java/libraries/retrofit2/play24/api.mustache b/src/main/resources/handlebars/Java/libraries/retrofit2/play24/api.mustache
index 2f968ee56c..2573e1c077 100644
--- a/src/main/resources/handlebars/Java/libraries/retrofit2/play24/api.mustache
+++ b/src/main/resources/handlebars/Java/libraries/retrofit2/play24/api.mustache
@@ -40,13 +40,16 @@ public interface {{classname}} {
   {{/@first}}
   {{/formParams}}
   {{^formParams}}
-  {{#prioritizedContentTypes}}
-  {{#@first}}
   @Headers({
-    "Content-Type:{{mediaType}}"
-  })
-  {{/@first}}
+  {{#prioritizedContentTypes}}
+    {{#@first}}
+    "Content-Type:{{mediaType}}"{{#hasProduces}},{{/hasProduces}}
+    {{/@first}}
   {{/prioritizedContentTypes}}
+  {{#hasProduces}}
+    "Accept:{{#produces}}{{{mediaType}}}{{#hasMore}}, {{/hasMore}}{{/produces}}"
+  {{/hasProduces}}
+  })
   {{/formParams}}  
   @{{httpMethod}}("{{{path}}}")
   F.Promise<Response<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Object{{/returnType}}>> {{operationId}}({{^parameters}});{{/parameters}}
diff --git a/src/main/resources/handlebars/Java/libraries/retrofit2/play25/api.mustache b/src/main/resources/handlebars/Java/libraries/retrofit2/play25/api.mustache
index 0e61b74cc6..5da703b2d3 100644
--- a/src/main/resources/handlebars/Java/libraries/retrofit2/play25/api.mustache
+++ b/src/main/resources/handlebars/Java/libraries/retrofit2/play25/api.mustache
@@ -40,13 +40,16 @@ public interface {{classname}} {
   {{/@first}}
   {{/formParams}}
   {{^formParams}}
-  {{#prioritizedContentTypes}}
-  {{#@first}}
   @Headers({
-    "Content-Type:{{{mediaType}}}"
-  })
-  {{/@first}}
+  {{#prioritizedContentTypes}}
+    {{#@first}}
+    "Content-Type:{{mediaType}}"{{#hasProduces}},{{/hasProduces}}
+    {{/@first}}
   {{/prioritizedContentTypes}}
+  {{#hasProduces}}
+    "Accept:{{#produces}}{{{mediaType}}}{{#hasMore}}, {{/hasMore}}{{/produces}}"
+  {{/hasProduces}}
+  })
   {{/formParams}}
   @{{httpMethod}}("{{{path}}}")
   CompletionStage<Response<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}>> {{operationId}}({{^parameters}});{{/parameters}}
diff --git a/src/main/resources/mustache/Java/libraries/retrofit2/api.mustache b/src/main/resources/mustache/Java/libraries/retrofit2/api.mustache
index d0ba50c189..7c750234ba 100644
--- a/src/main/resources/mustache/Java/libraries/retrofit2/api.mustache
+++ b/src/main/resources/mustache/Java/libraries/retrofit2/api.mustache
@@ -59,13 +59,16 @@ public interface {{classname}} {
   {{/-first}}
   {{/formParams}}
   {{^formParams}}
-  {{#prioritizedContentTypes}}
-  {{#-first}}
   @Headers({
-    "Content-Type:{{{mediaType}}}"
-  })
-  {{/-first}}
+  {{#prioritizedContentTypes}}
+    {{#@first}}
+    "Content-Type:{{mediaType}}"{{#hasProduces}},{{/hasProduces}}
+    {{/@first}}
   {{/prioritizedContentTypes}}
+  {{#hasProduces}}
+    "Accept:{{#produces}}{{{mediaType}}}{{#hasMore}}, {{/hasMore}}{{/produces}}"
+  {{/hasProduces}}
+  })
   {{/formParams}}
   @{{httpMethod}}("{{{path}}}")
   {{^doNotUseRx}}{{#useRxJava}}Observable<{{#isResponseFile}}ResponseBody{{/isResponseFile}}{{^isResponseFile}}{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}{{/isResponseFile}}>{{/useRxJava}}{{#useRxJava2}}{{#returnType}}Observable<{{#isResponseFile}}ResponseBody{{/isResponseFile}}{{^isResponseFile}}{{{returnType}}}{{/isResponseFile}}>{{/returnType}}{{^returnType}}Completable{{/returnType}}{{/useRxJava2}}{{/doNotUseRx}}{{#doNotUseRx}}Call<{{#isResponseFile}}ResponseBody{{/isResponseFile}}{{^isResponseFile}}{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}{{/isResponseFile}}>{{/doNotUseRx}} {{operationId}}({{^allParams}});{{/allParams}}
diff --git a/src/main/resources/mustache/Java/libraries/retrofit2/play24/api.mustache b/src/main/resources/mustache/Java/libraries/retrofit2/play24/api.mustache
index 762b95134c..1d3df32038 100644
--- a/src/main/resources/mustache/Java/libraries/retrofit2/play24/api.mustache
+++ b/src/main/resources/mustache/Java/libraries/retrofit2/play24/api.mustache
@@ -40,13 +40,16 @@ public interface {{classname}} {
   {{/-first}}
   {{/formParams}}
   {{^formParams}}
-  {{#prioritizedContentTypes}}
-  {{#-first}}
   @Headers({
-    "Content-Type:{{{mediaType}}}"
-  })
-  {{/-first}}
+  {{#prioritizedContentTypes}}
+    {{#@first}}
+    "Content-Type:{{mediaType}}"{{#hasProduces}},{{/hasProduces}}
+    {{/@first}}
   {{/prioritizedContentTypes}}
+  {{#hasProduces}}
+    "Accept:{{#produces}}{{{mediaType}}}{{#hasMore}}, {{/hasMore}}{{/produces}}"
+  {{/hasProduces}}
+  })
   {{/formParams}}
   @{{httpMethod}}("{{{path}}}")
   F.Promise<Response<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}>> {{operationId}}({{^parameters}});{{/parameters}}
diff --git a/src/main/resources/mustache/Java/libraries/retrofit2/play25/api.mustache b/src/main/resources/mustache/Java/libraries/retrofit2/play25/api.mustache
index 7361e0213a..5c03c0be5a 100644
--- a/src/main/resources/mustache/Java/libraries/retrofit2/play25/api.mustache
+++ b/src/main/resources/mustache/Java/libraries/retrofit2/play25/api.mustache
@@ -40,13 +40,16 @@ public interface {{classname}} {
   {{/-first}}
   {{/formParams}}
   {{^formParams}}
-  {{#prioritizedContentTypes}}
-  {{#-first}}
   @Headers({
-    "Content-Type:{{{mediaType}}}"
-  })
-  {{/-first}}
+  {{#prioritizedContentTypes}}
+    {{#@first}}
+    "Content-Type:{{mediaType}}"{{#hasProduces}},{{/hasProduces}}
+    {{/@first}}
   {{/prioritizedContentTypes}}
+  {{#hasProduces}}
+    "Accept:{{#produces}}{{{mediaType}}}{{#hasMore}}, {{/hasMore}}{{/produces}}"
+  {{/hasProduces}}
+  })
   {{/formParams}}
   @{{httpMethod}}("{{{path}}}")
   CompletionStage<Response<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}>> {{operationId}}({{^parameters}});{{/parameters}}