diff --git a/modules/swagger-generator/pom.xml b/modules/swagger-generator/pom.xml
index 5576bf1891a..b42a51a86af 100644
--- a/modules/swagger-generator/pom.xml
+++ b/modules/swagger-generator/pom.xml
@@ -15,9 +15,13 @@
         <resources>
             <resource>
                 <directory>src/main/resources</directory>
+                <filtering>true</filtering>
                 <excludes>
                     <exclude>logback.xml</exclude>
                 </excludes>
+                <includes>
+                    <include>**/version.prop</include>
+                </includes>
             </resource>
         </resources>
         <plugins>
diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/Bootstrap.java b/modules/swagger-generator/src/main/java/io/swagger/generator/Bootstrap.java
index 0e71119e67a..a81113ab76a 100644
--- a/modules/swagger-generator/src/main/java/io/swagger/generator/Bootstrap.java
+++ b/modules/swagger-generator/src/main/java/io/swagger/generator/Bootstrap.java
@@ -16,11 +16,16 @@
 
 package io.swagger.generator;
 
+import java.io.IOException;
+import java.io.InputStream;
+
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 
+import org.apache.commons.io.IOUtils;
+
 public class Bootstrap extends HttpServlet {
     public void init(ServletConfig config) throws ServletException {
         ServletContext context = config.getServletContext();
@@ -33,7 +38,17 @@ public class Bootstrap extends HttpServlet {
         bc.setTermsOfServiceUrl("http://swagger.io/terms/");
         bc.setContact("apiteam@swagger.io");
         bc.setLicense("Apache 2.0");
-        bc.setVersion("1.0.0");
+        InputStream stream = getClass().getResourceAsStream("/version.prop");
+        if(stream == null) {
+            bc.setVersion("0.0.0");
+        } else {
+            try {
+                bc.setVersion(IOUtils.toString(stream, "UTF-8"));
+                stream.close();
+            } catch (IOException e) {
+                bc.setVersion("0.0.0");
+            }
+        }
         bc.setHost("generator.swagger.io");
         bc.setLicenseUrl("http://www.apache.org/licenses/LICENSE-2.0.html");
         bc.setResourcePackage("io.swagger.generator.resource");
diff --git a/modules/swagger-generator/src/main/resources/version.prop b/modules/swagger-generator/src/main/resources/version.prop
new file mode 100644
index 00000000000..f2ab45c3b0e
--- /dev/null
+++ b/modules/swagger-generator/src/main/resources/version.prop
@@ -0,0 +1 @@
+${project.version}
\ No newline at end of file