diff --git a/pom.xml b/pom.xml
index 71672fc005..e3928c6e18 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,5 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>it.geosolutions.mapstore</groupId>
   <artifactId>mapstore-root</artifactId>
@@ -7,21 +7,20 @@
   <version>1.0-SNAPSHOT</version>
   <name>MapStore 2</name>
   <url>http://www.geo-solutions.it</url>
-
+  
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
-
   
   
   <dependencies>
-
-
+  
+  
   </dependencies>
-
+  
   <build>
   </build>
-
+  
   <profiles>
     <profile>
       <id>default</id>
@@ -31,23 +30,20 @@
       <modules>
         <module>web</module>
       </modules>
-
+    
     </profile>
     <profile>
       <id>release</id>
       <activation>
-          <property>
-              <name>release</name>
-          </property>
+        <property>
+          <name>release</name>
+        </property>
       </activation>
       <modules>
-          <module>release</module>
+        <module>release</module>
       </modules>
     </profile>
   </profiles>
 
-  
-  
-  
 
 </project>
diff --git a/release/bin.xml b/release/bin.xml
index 8cbab43c97..c5ea5a70fc 100644
--- a/release/bin.xml
+++ b/release/bin.xml
@@ -7,10 +7,18 @@
   <fileSets>
     <fileSet>
       <!-- the main webapp -->
-      <directory>../web/target</directory>
-      <outputDirectory>mapstore2/webapps</outputDirectory>
+      <directory>../web/target/mapstore</directory>
+      <outputDirectory>mapstore2/webapps/mapstore</outputDirectory>
       <includes>
-        <include>mapstore.war</include>
+        <include>**/*</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <!-- the main database -->
+      <directory>target</directory>
+      <outputDirectory>mapstore2/webapps/mapstore</outputDirectory>
+      <includes>
+        <include>geostore.h2.db</include>
       </includes>
     </fileSet>
     <fileSet>
diff --git a/release/data/geostore.h2.db b/release/data/geostore.h2.db
new file mode 100644
index 0000000000..df835a1298
Binary files /dev/null and b/release/data/geostore.h2.db differ
diff --git a/release/pom.xml b/release/pom.xml
index 7ced46d0e5..42e48d95b0 100644
--- a/release/pom.xml
+++ b/release/pom.xml
@@ -108,13 +108,15 @@
         <artifactId>maven-antrun-plugin</artifactId>
         <executions>
           <execution>
-            <id>untar-jre</id>
+            <id>untar-jre-copy-db</id>
             <phase>package</phase>
             <configuration>
               <tasks>
-                <echo message="Untar JRE" />
+                <echo message="Untar JRE..." />
                 <gunzip src="jre/jre.tar.gz" dest="${project.build.directory}/jre.tar" />
                 <untar src="${project.build.directory}/jre.tar" dest="${project.build.directory}/jre" />
+                <echo message="Copy Database..." />
+                <copyfile src="data/geostore.h2.db" dest="${project.build.directory}/geostore.h2.db" />
               </tasks>
             </configuration>
             <goals>