diff --git a/apache2-mod_reqtimeout.conf b/apache2-mod_reqtimeout.conf
index 728516b..2eb04f0 100644
--- a/apache2-mod_reqtimeout.conf
+++ b/apache2-mod_reqtimeout.conf
@@ -7,7 +7,7 @@
#
# mod_reqtimeout.c must be loaded.
#
-# see https://httpd.apache.org/docs/2.2/mod/mod_reqtimeout.html
+# see https://httpd.apache.org/docs/2.4/mod/mod_reqtimeout.html
# or /usr/share/apache2/manual/mod/mod_reqtimeout.html.en
#
# Note:
diff --git a/apache2-server-tuning.conf b/apache2-server-tuning.conf
index a528e40..a9c8ac5 100644
--- a/apache2-server-tuning.conf
+++ b/apache2-server-tuning.conf
@@ -10,47 +10,47 @@
# prefork MPM
# number of server processes to start
- # http://httpd.apache.org/docs/2.2/mod/mpm_common.html#startservers
+ # http://httpd.apache.org/docs/2.4/mod/mpm_common.html#startservers
StartServers 5
# minimum number of server processes which are kept spare
- # http://httpd.apache.org/docs/2.2/mod/prefork.html#minspareservers
+ # http://httpd.apache.org/docs/2.4/mod/prefork.html#minspareservers
MinSpareServers 5
# maximum number of server processes which are kept spare
- # http://httpd.apache.org/docs/2.2/mod/prefork.html#maxspareservers
+ # http://httpd.apache.org/docs/2.4/mod/prefork.html#maxspareservers
MaxSpareServers 10
# highest possible MaxClients setting for the lifetime of the Apache process.
- # http://httpd.apache.org/docs/2.2/mod/mpm_common.html#serverlimit
+ # http://httpd.apache.org/docs/2.4/mod/mpm_common.html#serverlimit
ServerLimit 150
# maximum number of server processes allowed to start
- # http://httpd.apache.org/docs/2.2/mod/mpm_common.html#maxclients
+ # http://httpd.apache.org/docs/2.4/mod/mpm_common.html#maxclients
MaxClients 150
# maximum number of requests a server process serves
- # http://httpd.apache.org/docs/2.2/mod/mpm_common.html#maxrequestsperchild
+ # http://httpd.apache.org/docs/2.4/mod/mpm_common.html#maxrequestsperchild
MaxRequestsPerChild 10000
# worker MPM
# initial number of server processes to start
- # http://httpd.apache.org/docs/2.2/mod/mpm_common.html#startservers
+ # http://httpd.apache.org/docs/2.4/mod/mpm_common.html#startservers
StartServers 3
# minimum number of worker threads which are kept spare
- # http://httpd.apache.org/docs/2.2/mod/mpm_common.html#minsparethreads
+ # http://httpd.apache.org/docs/2.4/mod/mpm_common.html#minsparethreads
MinSpareThreads 25
# maximum number of worker threads which are kept spare
- # http://httpd.apache.org/docs/2.2/mod/mpm_common.html#maxsparethreads
+ # http://httpd.apache.org/docs/2.4/mod/mpm_common.html#maxsparethreads
MaxSpareThreads 75
# upper limit on the configurable number of threads per child process
- # http://httpd.apache.org/docs/2.2/mod/mpm_common.html#threadlimit
+ # http://httpd.apache.org/docs/2.4/mod/mpm_common.html#threadlimit
ThreadLimit 64
# maximum number of simultaneous client connections
- # http://httpd.apache.org/docs/2.2/mod/mpm_common.html#maxclients
+ # http://httpd.apache.org/docs/2.4/mod/mpm_common.html#maxclients
MaxClients 150
# number of worker threads created by each child process
- # http://httpd.apache.org/docs/2.2/mod/mpm_common.html#threadsperchild
+ # http://httpd.apache.org/docs/2.4/mod/mpm_common.html#threadsperchild
ThreadsPerChild 25
# maximum number of requests a server process serves
- # http://httpd.apache.org/docs/2.2/mod/mpm_common.html#maxrequestsperchild
+ # http://httpd.apache.org/docs/2.4/mod/mpm_common.html#maxrequestsperchild
MaxRequestsPerChild 10000
diff --git a/apache2-vhost-ssl.template b/apache2-vhost-ssl.template
index 118949a..f07fe4f 100644
--- a/apache2-vhost-ssl.template
+++ b/apache2-vhost-ssl.template
@@ -11,7 +11,7 @@
# This is the Apache server configuration file providing SSL support.
# It contains the configuration directives to instruct the server how to
# serve pages over an https connection. For detailing information about these
-# directives see http://httpd.apache.org/docs/2.2/mod/mod_ssl.html
+# directives see http://httpd.apache.org/docs/2.4/mod/mod_ssl.html
#
# Do NOT simply read the instructions in here without understanding
# what they do. They're here only as hints or reminders. If you are unsure
diff --git a/apache2.changes b/apache2.changes
index 0001ef4..3f66faf 100644
--- a/apache2.changes
+++ b/apache2.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu Sep 25 14:39:05 UTC 2014 - pgajdos@suse.com
+
+- ServerSignature=Off and ServerTokens=Prod by request from
+ security team [bnc#716495]
+
+-------------------------------------------------------------------
+Wed Sep 24 13:11:16 UTC 2014 - pgajdos@suse.com
+
+- fix documentation links 2.2 -> 2.4 [bnc#888163] (internal)
+
-------------------------------------------------------------------
Mon Jul 21 16:23:51 UTC 2014 - crrodriguez@opensuse.org
diff --git a/sysconfig.apache2 b/sysconfig.apache2
index f47bc50..f29982d 100644
--- a/sysconfig.apache2
+++ b/sysconfig.apache2
@@ -191,7 +191,7 @@ APACHE_START_TIMEOUT="2"
# Configures the footer on server-generated documents
# This correlates to the ServerSignature directive.
#
-APACHE_SERVERSIGNATURE="on"
+APACHE_SERVERSIGNATURE="off"
## Type: list(debug,info,notice,warn,error,crit,alert,emerg)
## Default: "warn"
@@ -251,7 +251,7 @@ APACHE_USE_CANONICAL_NAME="off"
# (installed modules, versions, etc.)
# see http://httpd.apache.org/docs-2.2/mod/core.html#servertokens
#
-APACHE_SERVERTOKENS="OS"
+APACHE_SERVERTOKENS="ProductOnly"
## Type: list(on,off)
## Default: "off"