diff --git a/apache2.changes b/apache2.changes
index 21c7b85..9e6ef87 100644
--- a/apache2.changes
+++ b/apache2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Dec  7 18:05:37 UTC 2015 - crrodriguez@opensuse.org
+
+- systemd: Set TasksMax=infinity for current systemd releases.
+  The default limit of 512 is too small and prevents the creation of 
+  new server processes. Apache has its own runtime/harcoded limits.
+
 -------------------------------------------------------------------
 Thu Dec  3 10:00:28 UTC 2015 - pgajdos@suse.com
 
diff --git a/apache2.service b/apache2.service
index 268c403..6988107 100644
--- a/apache2.service
+++ b/apache2.service
@@ -11,6 +11,7 @@ ExecStart=/usr/sbin/start_apache2 -DSYSTEMD -DFOREGROUND -k start
 ExecReload=/usr/sbin/start_apache2 -DSYSTEMD -DFOREGROUND -k graceful
 ExecStop=/usr/sbin/start_apache2 -DSYSTEMD -DFOREGROUND -k graceful-stop
 KillMode=mixed
+TasksMax=infinity
 
 [Install]
 WantedBy=multi-user.target
diff --git a/apache2@.service b/apache2@.service
index b4ebe7a..16f2319 100644
--- a/apache2@.service
+++ b/apache2@.service
@@ -12,6 +12,7 @@ ExecStart=/usr/sbin/start_apache2 -DSYSTEMD -DFOREGROUND -k start
 ExecReload=/usr/sbin/start_apache2 -DSYSTEMD -DFOREGROUND -k graceful
 ExecStop=/usr/sbin/start_apache2 -DSYSTEMD -DFOREGROUND -k graceful-stop
 KillMode=mixed
+TasksMax=infinity
 
 [Install]
 WantedBy=multi-user.target