diff --git a/storm-core/pom.xml b/storm-core/pom.xml
index 096643eba17..3fdc59d320c 100644
--- a/storm-core/pom.xml
+++ b/storm-core/pom.xml
@@ -25,15 +25,17 @@
     </parent>
     <groupId>org.apache.storm</groupId>
     <artifactId>storm-core</artifactId>
-    <packaging>jar</packaging>
     <name>Storm Core</name>
     <description>Storm Core Java API and Clojure implementation.</description>
 
     <properties>
+        <packaging.type>jar</packaging.type>
         <worker-launcher.conf.dir>/etc/storm</worker-launcher.conf.dir>
         <worker-launcher.additional_cflags></worker-launcher.additional_cflags>
     </properties>
 
+    <packaging>${packaging.type}</packaging>
+
     <dependencies>
         <dependency>
             <groupId>com.esotericsoftware.kryo</groupId>
@@ -775,10 +777,35 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>  
+                <groupId>org.apache.maven.plugins</groupId>  
+                <artifactId>maven-war-plugin</artifactId>  
+                <version>2.2</version>  
+                <configuration>  
+                    <webResources>  
+                      <resource>                      
+                          <directory>src/ui/public</directory>  
+                      </resource>  
+                   </webResources>  
+                </configuration>  
+           </plugin> 
         </plugins>
     </build>
 
     <profiles>
+        <profile>
+                <activation>
+                        <property>
+                                <name>war</name>
+                        </property>
+                </activation>
+                <properties>
+                        <packaging.type>war</packaging.type>
+                </properties>
+                <build>
+                        <finalName>storm-ui</finalName>
+                </build>
+        </profile>
         <profile>
             <id>coverage</id>
             <activation><activeByDefault>true</activeByDefault></activation>
diff --git a/storm-core/src/ui/public/WEB-INF/web.xml b/storm-core/src/ui/public/WEB-INF/web.xml
new file mode 100644
index 00000000000..03390f002cb
--- /dev/null
+++ b/storm-core/src/ui/public/WEB-INF/web.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+	<display-name>Storm UI</display-name>
+	<context-param>
+		<param-name>debug</param-name>
+		<param-value>false</param-value>
+	</context-param>
+
+	<session-config>
+		<!-- 10 minutes -->
+		<session-timeout>10</session-timeout>
+	</session-config>
+</web-app>