diff --git a/apache/files/_core.conf b/apache/files/_core.conf
new file mode 100644
index 0000000..7aa0cea
--- /dev/null
+++ b/apache/files/_core.conf
@@ -0,0 +1,15 @@
+
+  {#- Disable KeepAlive to fix bug #1630664 a.k.a the #}
+  {#- ('Connection aborted.', BadStatusLine("''",)) error #}
+  {%- if site.get('keepalive', {}).enabled is defined %}
+    {%- set keepalive = 'On' if site.keepalive.enabled else 'Off' %}
+  {%- elif site.get('ssl', {}).get('enabled') %}
+    {%- set keepalive = 'Off' %}
+  {%- endif %}
+
+  {%- if keepalive is defined %}
+  KeepAlive  {{ keepalive }}
+  {%- endif %}
+  {%- if site.get('keepalive', {}).timeout is defined %}
+  KeepAliveTimeout {{ site.keepalive.timeout }}
+  {%- endif %}
diff --git a/apache/files/wsgi.conf b/apache/files/wsgi.conf
index 2a62735..23f9afe 100644
--- a/apache/files/wsgi.conf
+++ b/apache/files/wsgi.conf
@@ -11,6 +11,7 @@
   {%- include "apache/files/_name.conf" %}
   {%- include "apache/files/_wsgi.conf" %}
   {%- include "apache/files/_ssl.conf" %}
+  {%- include "apache/files/_core.conf" %}
   {%- include "apache/files/_log.conf" %}
   {%- include "apache/files/_limits.conf" %}