diff --git a/tomcat/defaults/main.yml b/tomcat/defaults/main.yml
index d59f00a3..14b06340 100644
--- a/tomcat/defaults/main.yml
+++ b/tomcat/defaults/main.yml
@@ -33,6 +33,7 @@ tomcat_ajp_address: 127.0.0.1
 tomcat_shutdown_port: -1
 tomcat_shutdown_pwd: "{{ lookup('password', '/tmp/passwordfile chars=ascii_letters,digits') }}"
 tomcat_restart_timeout: 300
+tomcat_max_post_size: 1000000
 tomcat_catalina_home_dir: '/usr/share/tomcat{{ tomcat_version }}'
 tomcat_catalina_base_dir: '/var/lib/tomcat{{ tomcat_version }}'
 tomcat_conf_dir: '/etc/tomcat{{ tomcat_version }}'
diff --git a/tomcat/templates/tomcat-server.xml.j2 b/tomcat/templates/tomcat-server.xml.j2
index 2268cb41..deb06736 100644
--- a/tomcat/templates/tomcat-server.xml.j2
+++ b/tomcat/templates/tomcat-server.xml.j2
@@ -76,7 +76,7 @@
 {% if tomcat_http_enabled %}
     <!-- A http "Connector" using the shared thread pool-->
     <Connector executor="tomcatThreadPool"
-	       enableLookups="false"
+	       enableLookups="false" maxPostSize="{{ tomcat_max_post_size }}"
                maxThreads="{{ tomcat_max_threads }}" connectionTimeout="60000"
 	       URIEncoding="UTF-8" bindOnInit="false" address="{{ tomcat_http_address }}"
                port="{{ tomcat_http_port }}" protocol="HTTP/1.1"
@@ -95,7 +95,7 @@
 {% if tomcat_ajp_enabled %}
     <!-- Define an AJP 1.3 Connector on port {{ tomcat_ajp_port }} -->
     <Connector port="{{ tomcat_ajp_port }}" protocol="AJP/1.3" redirectPort="8443"
-	       enableLookups="false" address="{{ tomcat_ajp_address }}"
+	       enableLookups="false" address="{{ tomcat_ajp_address }}" maxPostSize="{{ tomcat_max_post_size }}"
                maxThreads="{{ tomcat_max_threads }}" connectionTimeout="60000"
 	       URIEncoding="UTF-8" bindOnInit="false" />
 {% endif %}