diff --git a/modules/swagger-codegen/src/main/resources/go-server/README.mustache b/modules/swagger-codegen/src/main/resources/go-server/README.mustache
index 8e0af32842..8b66fe30f4 100644
--- a/modules/swagger-codegen/src/main/resources/go-server/README.mustache
+++ b/modules/swagger-codegen/src/main/resources/go-server/README.mustache
@@ -1,21 +1,30 @@
-# Swagger generated server
+# Go API Server for {{packageName}}
+
+{{#appDescription}}
+{{{appDescription}}}
+{{/appDescription}}
 
 ## Overview
-This server was generated by the [swagger-codegen](https://github.com/swagger-api/swagger-codegen) project.  By using the [OpenAPI-Spec](https://github.com/OAI/OpenAPI-Specification) from a remote server, you can easily generate a server stub.  This is an example of building a node.js server.
+This server was generated by the [swagger-codegen]
+(https://github.com/swagger-api/swagger-codegen) project.  
+By using the [OpenAPI-Spec](https://github.com/OAI/OpenAPI-Specification) from a remote server, you can easily generate a server stub.  
+-
 
 To see how to make this your own, look here:
 
 [README](https://github.com/swagger-api/swagger-codegen/blob/master/README.md)
 
+- API version: {{appVersion}}
+- Build date: {{generatedDate}}
+{{#infoUrl}}
+For more information, please visit [{{{infoUrl}}}]({{{infoUrl}}})
+{{/infoUrl}}
+
+
 ### Running the server
 To run the server, follow these simple steps:
 
 ```
-
+go run main.go
 ```
 
-To view the Swagger UI interface:
-
-```
-
-```
diff --git a/modules/swagger-codegen/src/main/resources/go-server/routers.mustache b/modules/swagger-codegen/src/main/resources/go-server/routers.mustache
index a887fdcf8b..5999268a52 100644
--- a/modules/swagger-codegen/src/main/resources/go-server/routers.mustache
+++ b/modules/swagger-codegen/src/main/resources/go-server/routers.mustache
@@ -16,7 +16,6 @@ type Route struct {
 type Routes []Route
 
 func NewRouter() *mux.Router {
-
 	router := mux.NewRouter().StrictSlash(true)
 	for _, route := range routes {
 		var handler http.Handler
diff --git a/samples/server/petstore/go-api-server/go/README.md b/samples/server/petstore/go-api-server/go/README.md
index 8e0af32842..62ca0d7690 100644
--- a/samples/server/petstore/go-api-server/go/README.md
+++ b/samples/server/petstore/go-api-server/go/README.md
@@ -1,21 +1,25 @@
-# Swagger generated server
+# Go API Server for petstoreserver
+
+This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
 
 ## Overview
-This server was generated by the [swagger-codegen](https://github.com/swagger-api/swagger-codegen) project.  By using the [OpenAPI-Spec](https://github.com/OAI/OpenAPI-Specification) from a remote server, you can easily generate a server stub.  This is an example of building a node.js server.
+This server was generated by the [swagger-codegen]
+(https://github.com/swagger-api/swagger-codegen) project.  
+By using the [OpenAPI-Spec](https://github.com/OAI/OpenAPI-Specification) from a remote server, you can easily generate a server stub.  
+-
 
 To see how to make this your own, look here:
 
 [README](https://github.com/swagger-api/swagger-codegen/blob/master/README.md)
 
+- API version: 1.0.0
+- Build date: 2016-05-27T09:17:10.992-07:00
+
+
 ### Running the server
 To run the server, follow these simple steps:
 
 ```
-
+go run main.go
 ```
 
-To view the Swagger UI interface:
-
-```
-
-```
diff --git a/samples/server/petstore/go-api-server/go/routers.go b/samples/server/petstore/go-api-server/go/routers.go
index 28642b252e..8704c12c4b 100644
--- a/samples/server/petstore/go-api-server/go/routers.go
+++ b/samples/server/petstore/go-api-server/go/routers.go
@@ -16,7 +16,6 @@ type Route struct {
 type Routes []Route
 
 func NewRouter() *mux.Router {
-
 	router := mux.NewRouter().StrictSlash(true)
 	for _, route := range routes {
 		var handler http.Handler