diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/GoClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/GoClientCodegen.java
index 5bebf9328517..e9ebf27e8a4a 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/GoClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/GoClientCodegen.java
@@ -134,6 +134,7 @@ public class GoClientCodegen extends DefaultCodegen implements CodegenConfig {
         supportingFiles.add(new SupportingFile("git_push.sh.mustache", "", "git_push.sh"));
         supportingFiles.add(new SupportingFile("gitignore.mustache", "", ".gitignore"));
         supportingFiles.add(new SupportingFile("configuration.mustache", packageName, "configuration.go"));
+        supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml"));
     }
 
     @Override
diff --git a/modules/swagger-codegen/src/main/resources/go/pom.mustache b/modules/swagger-codegen/src/main/resources/go/pom.mustache
new file mode 100644
index 000000000000..47b7e25203d7
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/go/pom.mustache
@@ -0,0 +1,35 @@
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.wordnik</groupId>
+    <artifactId>Go{{packageName}}</artifactId>
+    <packaging>pom</packaging>
+    <version>{{packageVersion}}</version>
+    <name>Go{{packageName}}</name>
+    <build>
+        <defaultGoal>compile</defaultGoal>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <version>1.7</version>
+            <executions>
+              <execution>
+              <id>build-go</id>
+              <phase>compile</phase>
+              <goals>
+                  <goal>run</goal>
+              </goals>
+              <configuration>
+                  <exportAntProperties>true</exportAntProperties>
+                  <target>
+                     <exec executable="go">
+                         <arg value="build"/>
+                     </exec>
+                  </target>
+              </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/samples/client/petstore/go/pom.xml b/samples/client/petstore/go/pom.xml
index 36203920e61c..5c00de82ce03 100644
--- a/samples/client/petstore/go/pom.xml
+++ b/samples/client/petstore/go/pom.xml
@@ -1,10 +1,10 @@
 <project>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.wordnik</groupId>
-    <artifactId>GoPetstoreClientTests</artifactId>
+    <artifactId>Goswagger</artifactId>
     <packaging>pom</packaging>
-    <version>1.0-SNAPSHOT</version>
-    <name>Go Swagger Petstore Client</name>
+    <version>1.0.0</version>
+    <name>Goswagger</name>
     <build>
         <defaultGoal>compile</defaultGoal>
         <plugins>