diff --git a/bin/html2-petstore.sh b/bin/html2-petstore.sh
index 48d7f6147f6..3cafc168907 100755
--- a/bin/html2-petstore.sh
+++ b/bin/html2-petstore.sh
@@ -26,6 +26,6 @@ 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.yaml -l html2  -o samples/html2"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l html2  -o samples/html2 --additional-properties hideGenerationTimestamp=true"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/modules/swagger-codegen/src/main/resources/htmlDocs2/index.mustache b/modules/swagger-codegen/src/main/resources/htmlDocs2/index.mustache
index c529d8d58c8..d2878b33492 100644
--- a/modules/swagger-codegen/src/main/resources/htmlDocs2/index.mustache
+++ b/modules/swagger-codegen/src/main/resources/htmlDocs2/index.mustache
@@ -438,12 +438,12 @@
               {{/licenseUrl}}
             </div>
           </div>
-          <div id="generator">
+{{^hideGenerationTimestamp}}          <div id="generator">
             <div class="content">
               Generated {{generatedDate}}
             </div>
           </div>
-      </div>
+{{/hideGenerationTimestamp}}      </div>
     </div>
   </div>
   {{>js_jsonformatter}}
diff --git a/samples/html2/index.html b/samples/html2/index.html
index fb509613ef9..cb667b55eb6 100644
--- a/samples/html2/index.html
+++ b/samples/html2/index.html
@@ -1870,8 +1870,8 @@ except ApiException as e:
   "type" : "array",
   "items" : {
     "type" : "string",
-    "default" : "available",
-    "enum" : [ "available", "pending", "sold" ]
+    "enum" : [ "available", "pending", "sold" ],
+    "default" : "available"
   },
   "collectionFormat" : "csv"
 };
@@ -7291,11 +7291,6 @@ except ApiException as e:
                 <div class="license-url">http://www.apache.org/licenses/LICENSE-2.0.html</div>
             </div>
           </div>
-          <div id="generator">
-            <div class="content">
-              Generated 2017-03-23T14:23:30.922+08:00
-            </div>
-          </div>
       </div>
     </div>
   </div>