diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6c7a40bd..e077d9b4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ The **patch** part changes incrementally at each release.
 ### Added
 
 * varnish: variable for jail configuration
+* apache: Add possibility to change ulimit for Apache
 
 ### Changed
 
diff --git a/apache/defaults/main.yml b/apache/defaults/main.yml
index 15ff1a53..dab98450 100644
--- a/apache/defaults/main.yml
+++ b/apache/defaults/main.yml
@@ -14,6 +14,10 @@ apache_evolinux_default_ssl_key: /etc/ssl/private/ssl-cert-snakeoil.key
 apache_serverstatus_suffix: ""
 apache_serverstatus_suffix_file: "/etc/evolinux/apache_serverstatus_suffix"
 
+# Change Apache's ulimit through APACHE_ULIMIT_MAX_FILES
+apache_change_ulimit: True
+apache_ulimit_max: '65536'
+
 apache_log2mail_include: True
 apache_munin_include: True
 
diff --git a/apache/tasks/main.yml b/apache/tasks/main.yml
index b7611cac..1c61932b 100644
--- a/apache/tasks/main.yml
+++ b/apache/tasks/main.yml
@@ -137,6 +137,16 @@
   tags:
     - apache
 
+- name: Add line in envvars for ulimit
+  lineinfile:
+    path: /etc/apache2/envvars
+    regexp: '^#?APACHE_ULIMIT_MAX_FILES='
+    line: "APACHE_ULIMIT_MAX_FILES='ulimit -n {{ apache_ulimit_max }}'"
+  when: apache_change_ulimit
+  notify: 'restart apache'
+  tags:
+    - apache
+
 - include_role:
     name: evolix/remount-usr
   tags: