diff --git a/bin/bash-petstore.sh b/bin/bash-petstore.sh
index 9988a1157f2..19ee5940f27 100755
--- a/bin/bash-petstore.sh
+++ b/bin/bash-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"
-args="$@ generate -t modules/swagger-codegen/src/main/resources/bash -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l bash -o samples/client/petstore/bash -c modules/swagger-codegen/src/test/resources/2_0/bash-config.json"
+args="$@ generate -t modules/swagger-codegen/src/main/resources/bash -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l bash -o samples/client/petstore/bash -c modules/swagger-codegen/src/test/resources/2_0/bash-config.json --additional-properties hideGenerationTimestamp=true"
 
 java $JAVA_OPTS -jar $executable $args
diff --git a/modules/swagger-codegen/src/main/resources/bash/bash-completion.mustache b/modules/swagger-codegen/src/main/resources/bash/bash-completion.mustache
index 83b907259ad..b0dda47fcaf 100644
--- a/modules/swagger-codegen/src/main/resources/bash/bash-completion.mustache
+++ b/modules/swagger-codegen/src/main/resources/bash/bash-completion.mustache
@@ -8,8 +8,8 @@
 # ! swagger-codegen (https://github.com/swagger-api/swagger-codegen)
 # ! FROM SWAGGER SPECIFICATION IN JSON.
 # !
-# ! Generated on: {{generatedDate}}
-# !
+{{^hideGenerationTimestamp}}# ! Generated on: {{generatedDate}}
+{{/hideGenerationTimestamp}}# !
 # !
 # ! System wide installation:
 # !
diff --git a/modules/swagger-codegen/src/main/resources/bash/client.mustache b/modules/swagger-codegen/src/main/resources/bash/client.mustache
index 6ed2247b574..bd17edbb3c5 100644
--- a/modules/swagger-codegen/src/main/resources/bash/client.mustache
+++ b/modules/swagger-codegen/src/main/resources/bash/client.mustache
@@ -8,8 +8,8 @@
 # ! swagger-codegen (https://github.com/swagger-api/swagger-codegen)
 # ! FROM SWAGGER SPECIFICATION IN JSON.
 # !
-# ! Generated on: {{generatedDate}}
-# !
+{{^hideGenerationTimestamp}}# ! Generated on: {{generatedDate}}
+{{/hideGenerationTimestamp}}# !
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 #
diff --git a/modules/swagger-codegen/src/main/resources/bash/zsh-completion.mustache b/modules/swagger-codegen/src/main/resources/bash/zsh-completion.mustache
index 064b9a01fe0..3438d9cf57b 100644
--- a/modules/swagger-codegen/src/main/resources/bash/zsh-completion.mustache
+++ b/modules/swagger-codegen/src/main/resources/bash/zsh-completion.mustache
@@ -10,8 +10,8 @@
 # !
 # ! Based on: https://github.com/Valodim/zsh-curl-completion/blob/master/_curl
 # !
-# ! Generated on: {{generatedDate}}
-# !
+{{^hideGenerationTimestamp}}# ! Generated on: {{generatedDate}}
+{{/hideGenerationTimestamp}}# !
 # !
 # ! Installation:
 # !
diff --git a/samples/client/petstore/bash/_petstore-cli b/samples/client/petstore/bash/_petstore-cli
index 83c205c60d4..829e500ba2a 100644
--- a/samples/client/petstore/bash/_petstore-cli
+++ b/samples/client/petstore/bash/_petstore-cli
@@ -10,7 +10,6 @@
 # !
 # ! Based on: https://github.com/Valodim/zsh-curl-completion/blob/master/_curl
 # !
-# ! Generated on: 2017-02-22T08:48:10.130+01:00
 # !
 # !
 # ! Installation:
diff --git a/samples/client/petstore/bash/petstore-cli b/samples/client/petstore/bash/petstore-cli
index d967af25bb6..4be94c037dc 100755
--- a/samples/client/petstore/bash/petstore-cli
+++ b/samples/client/petstore/bash/petstore-cli
@@ -8,7 +8,6 @@
 # ! swagger-codegen (https://github.com/swagger-api/swagger-codegen)
 # ! FROM SWAGGER SPECIFICATION IN JSON.
 # !
-# ! Generated on: 2017-02-22T08:48:10.130+01:00
 # !
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
diff --git a/samples/client/petstore/bash/petstore-cli.bash-completion b/samples/client/petstore/bash/petstore-cli.bash-completion
index 58e1965d5c6..6b05bd0a97f 100644
--- a/samples/client/petstore/bash/petstore-cli.bash-completion
+++ b/samples/client/petstore/bash/petstore-cli.bash-completion
@@ -8,7 +8,6 @@
 # ! swagger-codegen (https://github.com/swagger-api/swagger-codegen)
 # ! FROM SWAGGER SPECIFICATION IN JSON.
 # !
-# ! Generated on: 2017-02-22T08:48:10.130+01:00
 # !
 # !
 # ! System wide installation: