diff --git a/modules/swagger-generator/pom.xml b/modules/swagger-generator/pom.xml
index f9ca693cc2c..121c489d551 100644
--- a/modules/swagger-generator/pom.xml
+++ b/modules/swagger-generator/pom.xml
@@ -127,6 +127,49 @@
+
+ com.googlecode.maven-download-plugin
+ download-maven-plugin
+ 1.2.1
+
+
+ swagger-ui
+
+ wget
+
+
+ https://github.com/swagger-api/swagger-ui/archive/master.tar.gz
+ true
+ ${project.build.directory}
+
+
+
+
+
+ maven-resources-plugin
+ 2.6
+
+
+ copy-resources
+ validate
+
+ copy-resources
+
+
+ target/${project.artifactId}-${project.version}
+
+
+ ${project.build.directory}/swagger-ui-master/dist
+ true
+
+ index.html
+
+
+
+
+
+
+
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 ffd036f9ec7..f6d924c00ad 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
@@ -29,8 +29,7 @@ public class Bootstrap extends HttpServlet {
bc.setBasePath("/api");
bc.setTitle("Swagger Generator");
bc.setDescription("This is an online swagger codegen server. You can find out more " +
- "at https://github.com/swagger-api/swagger-codegen or on irc.freenode.net, #swagger." +
- "http://swagger.io/terms/");
+ "at https://github.com/swagger-api/swagger-codegen or on [irc.freenode.net, #swagger](http://swagger.io/irc/).");
bc.setTermsOfServiceUrl("http://swagger.io/terms/");
bc.setContact("apiteam@swagger.io");
bc.setLicense("Apache 2.0");
diff --git a/modules/swagger-generator/src/main/webapp/index.html b/modules/swagger-generator/src/main/webapp/index.html
new file mode 100644
index 00000000000..021310d9dec
--- /dev/null
+++ b/modules/swagger-generator/src/main/webapp/index.html
@@ -0,0 +1,102 @@
+
+
+
+ Swagger UI
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+