diff --git a/build.gradle b/build.gradle
index a37cb600..519d235e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -194,16 +194,9 @@ task wrapper(type: Wrapper) {
 
 /* compiling */
 task buildInfo << {
-    def buildNumberFile = file('grails-app/conf/buildNumber')
-    String buildNumber = '0'
-    if (buildNumberFile.exists()) {
-        buildNumber = buildNumberFile.text.trim()
-        buildNumber = ((buildNumber as long) + 1L).toString()
-    }
-    buildNumberFile.text = buildNumber
     def formatter = new SimpleDateFormat('''yyyy-MM-dd'T'HH:mm:ssZ''')
     def replaceTokens = [
-        'info.app.buildNumber': buildNumber,
+        'info.app.buildNumber': computeBuildNumber(1L).toString(),
         'info.app.buildDate': formatter.format(new Date())
     ]
 
@@ -229,11 +222,27 @@ processResources.finalizedBy buildInfo
 
 /* archive building */
 war {
+    doFirst {
+        copy {
+            from(sourceSets.main.resources) {
+                include 'web.xml'
+            }
+            into temporaryDir
+            filter(
+                ReplaceTokens,
+                tokens: [
+                    version: project.version,
+                    buildNumber: computeBuildNumber().toString()
+                ]
+            )
+        }
+    }
     from(processResources) {
         include 'launcher*.properties'
         include 'logo.png'
         include 'spinner.gif'
     }
+    webXml = new File(temporaryDir, 'web.xml')
 }
 bootRepackage.dependsOn jar
 // This doesn't work.  Probably the property is set during execution time.
@@ -310,3 +319,17 @@ eclipse {
         natures 'org.springsource.ide.eclipse.gradle.core.nature'
     }
 }
+
+
+long computeBuildNumber(long offset = 0L) {
+    long buildNumber = 0L
+
+    File buildNumberFile = file('grails-app/conf/buildNumber')
+    if (buildNumberFile.exists()) {
+        buildNumber = buildNumberFile.text.trim() as long
+        if (offset > 0L) buildNumber += offset
+    }
+    if (offset > 0L) buildNumberFile.text = buildNumber.toString()
+
+    buildNumber
+}
diff --git a/grails-app/conf/application.yml b/grails-app/conf/application.yml
index d0108708..078353c4 100644
--- a/grails-app/conf/application.yml
+++ b/grails-app/conf/application.yml
@@ -78,6 +78,9 @@ grails:
             maxsize: 1000
     controllers:
         defaultScope: singleton
+        upload:
+            maxFileSize: 5242880
+            maxRequestSize: 5242880
     converters:
         encoding: UTF-8
     views:
diff --git a/grails-app/conf/buildNumber b/grails-app/conf/buildNumber
index 785aa110..e5f64fb4 100644
--- a/grails-app/conf/buildNumber
+++ b/grails-app/conf/buildNumber
@@ -1 +1 @@
-11061
\ No newline at end of file
+11068
\ No newline at end of file
diff --git a/src/main/resources/web.xml b/src/main/resources/web.xml
new file mode 100644
index 00000000..baa90484
--- /dev/null
+++ b/src/main/resources/web.xml
@@ -0,0 +1,6 @@
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+  version="3.1">
+  <display-name>SpringCRM @version@ (Build @buildNumber@)</display-name>
+</web-app>