diff --git a/modules/swagger-codegen/src/main/resources/htmlDocs/index.mustache b/modules/swagger-codegen/src/main/resources/htmlDocs/index.mustache
index ac07a3fd9f..176e4ad33c 100644
--- a/modules/swagger-codegen/src/main/resources/htmlDocs/index.mustache
+++ b/modules/swagger-codegen/src/main/resources/htmlDocs/index.mustache
@@ -154,6 +154,10 @@
     <h3 class="field-label"><a name="{{classname}}">{{classname}}</a> <a class="up" href="#__Models">Up</a></h3>
     <div class="field-items">
       {{#vars}}<div class="param">{{name}} {{#isNotRequired}}(optional){{/isNotRequired}}</div><div class="param-desc"><span class="param-type">{{datatype}}</span> {{description}}</div>
+      {{#isEnum}}
+        <div class="param-enum-header">Enum:</div>
+        {{#_enum}}<div class="param-enum">{{this}}</div>{{/_enum}}
+      {{/isEnum}}
       {{/vars}}
     </div>  <!-- field-items -->
   </div>
diff --git a/modules/swagger-codegen/src/main/resources/htmlDocs/style.css.mustache b/modules/swagger-codegen/src/main/resources/htmlDocs/style.css.mustache
index d69f0e7b16..8d9a5755d7 100644
--- a/modules/swagger-codegen/src/main/resources/htmlDocs/style.css.mustache
+++ b/modules/swagger-codegen/src/main/resources/htmlDocs/style.css.mustache
@@ -124,6 +124,20 @@ code {
   font-style: italic;
 }
 
+.param-enum-header {
+width: 700px;
+padding: 0 0 0 60px;
+color: #777;
+font-weight: bold;
+}
+
+.param-enum {
+width: 700px;
+padding: 0 0 0 80px;
+color: #777;
+font-style: italic;
+}
+
 .field-label {
   padding: 0;
   margin: 0;
diff --git a/modules/swagger-codegen/src/main/resources/swagger-static/assets/css/style.css b/modules/swagger-codegen/src/main/resources/swagger-static/assets/css/style.css
index f14f6bdb62..b596c11a53 100644
--- a/modules/swagger-codegen/src/main/resources/swagger-static/assets/css/style.css
+++ b/modules/swagger-codegen/src/main/resources/swagger-static/assets/css/style.css
@@ -100,6 +100,10 @@
   float: left;
 }
 
+.param-enum {
+  margin-left: 20px;
+}
+
 .section-header {
   border-bottom: 2px;
   font-weight: bold;
diff --git a/modules/swagger-codegen/src/main/resources/swagger-static/model.mustache b/modules/swagger-codegen/src/main/resources/swagger-static/model.mustache
index a9a39ab6e9..e6f85872c7 100644
--- a/modules/swagger-codegen/src/main/resources/swagger-static/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/swagger-static/model.mustache
@@ -5,7 +5,16 @@
   {{#vars}}
 <ul class="parameter">
   <li class="param-required-{{required}}">{{name}} : {{datatype}}
-	  <br/>{{description}}
+    <br/>{{description}}
+    {{#isEnum}}
+      <dl class="param-enum">
+        <dt>Enum:
+          {{#_enum}}
+            <dd>{{this}}</dd>
+          {{/_enum}}
+        </dt>
+      </dl>
+    {{/isEnum}}
   </li>
 </ul>
   {{/vars}}