diff --git a/modules/swagger-codegen/src/main/resources/go/configuration.mustache b/modules/swagger-codegen/src/main/resources/go/configuration.mustache
index ae711d5dd49..a9bbd48bd94 100644
--- a/modules/swagger-codegen/src/main/resources/go/configuration.mustache
+++ b/modules/swagger-codegen/src/main/resources/go/configuration.mustache
@@ -18,6 +18,7 @@ type Configuration struct {
     Scheme  string  `json:"scheme,omitempty"`
     AccessToken string `json:"accessToken,omitempty"`
     DefaultHeader map[string]string `json:"defaultHeader,omitempty"`
+    UserAgent string `json:"userAgent,omitempty"`
 }
 
 func NewConfiguration() *Configuration {
@@ -27,7 +28,8 @@ func NewConfiguration() *Configuration {
         Debug: false,
         DefaultHeader: make(map[string]string),
         ApiKey: make(map[string]string),
-        ApiKeyPrefix: make(map[string]string) ,
+        ApiKeyPrefix: make(map[string]string),
+        UserAgent: "Swagger-Codegen/{{version}}/go",
         }
 }
 
diff --git a/samples/client/petstore/go/swagger/Configuration.go b/samples/client/petstore/go/swagger/Configuration.go
index 83f3bd13ef7..b231bd8aa48 100644
--- a/samples/client/petstore/go/swagger/Configuration.go
+++ b/samples/client/petstore/go/swagger/Configuration.go
@@ -18,6 +18,7 @@ type Configuration struct {
     Scheme  string  `json:"scheme,omitempty"`
     AccessToken string `json:"accessToken,omitempty"`
     DefaultHeader map[string]string `json:"defaultHeader,omitempty"`
+    UserAgent string `json:"userAgent,omitempty"`
 }
 
 func NewConfiguration() *Configuration {
@@ -27,7 +28,8 @@ func NewConfiguration() *Configuration {
         Debug: false,
         DefaultHeader: make(map[string]string),
         ApiKey: make(map[string]string),
-        ApiKeyPrefix: make(map[string]string) ,
+        ApiKeyPrefix: make(map[string]string),
+        UserAgent: "Swagger-Codegen/1.0.0/go",
         }
 }