diff --git a/apache/config-freebsd-11.0-ALL b/apache/config-freebsd-11.0-ALL
new file mode 100644
index 000000000..bccb0d9bf
--- /dev/null
+++ b/apache/config-freebsd-11.0-ALL
@@ -0,0 +1,19 @@
+show_list=0
+httpd_dir=/usr/local
+httpd_path=/usr/local/sbin/httpd
+apachectl_path=/usr/local/sbin/apachectl
+httpd_conf=/usr/local/etc/apache24/httpd.conf
+mime_types=/usr/local/etc/apache24/mime.types
+srm_conf=/usr/local/etc/apache24/srm.conf
+access_conf=/usr/local/etc/apache24/access.conf
+show_order=0
+max_servers=100
+test_config=1
+test_manual=0
+test_always=0
+test_apachectl=1
+auto_mods=1
+pid_file=/var/run/httpd.pid
+show_names=0
+allow_virtualmin=0
+format_config=1
diff --git a/apache/config-freebsd-8.0-ALL b/apache/config-freebsd-8.0-10.4
similarity index 100%
rename from apache/config-freebsd-8.0-ALL
rename to apache/config-freebsd-8.0-10.4
diff --git a/apache/config-solaris-11-ALL b/apache/config-solaris-11-ALL
index 950e80a4d..aa568090a 100644
--- a/apache/config-solaris-11-ALL
+++ b/apache/config-solaris-11-ALL
@@ -1,11 +1,11 @@
 show_list=0
-httpd_dir=/usr/apache2/2.2
-httpd_conf=/etc/apache2/2.2/httpd.conf
-httpd_path=/usr/apache2/2.2/bin/httpd
-apachectl_path=/usr/apache2/2.2/bin/apachectl
-pid_file=/var/run/apache2/2.2/httpd.pid
-start_cmd=svcadm enable svc:/network/http:apache22
-stop_cmd=svcadm disable svc:/network/http:apache22
+httpd_dir=/usr/apache2/2.4
+httpd_conf=/etc/apache2/2.4/httpd.conf
+httpd_path=/usr/apache2/2.4/bin/httpd
+apachectl_path=/usr/apache2/2.4/bin/apachectl
+pid_file=/var/run/apache2/2.4/httpd.pid
+start_cmd=svcadm enable svc:/network/http:apache24
+stop_cmd=svcadm disable svc:/network/http:apache24
 mime_types=
 srm_conf=
 access_conf=
diff --git a/software/pkg-lib.pl b/software/pkg-lib.pl
index 4a14c4d5d..e20afbb36 100644
--- a/software/pkg-lib.pl
+++ b/software/pkg-lib.pl
@@ -92,7 +92,7 @@ return @rv;
 sub update_system_resolve
 {
 local ($name) = @_;
-return $name eq "apache" ? "apache22 ap22-mod_.*" :
+return $name eq "apache" ? "apache24 ap24-mod_.*" :
        $name eq "dhcpd" ? "isc-dhcp42-server" :
        $name eq "mysql" ? "mysql-server" :
        $name eq "openssh" ? "openssh-portable" :
diff --git a/software/ports-lib.pl b/software/ports-lib.pl
index 4cd4bc5de..199070bf0 100644
--- a/software/ports-lib.pl
+++ b/software/ports-lib.pl
@@ -99,7 +99,7 @@ return @rv;
 sub update_system_resolve
 {
 local ($name) = @_;
-return $name eq "apache" ? "apache22 ap22-mod_.*" :
+return $name eq "apache" ? "apache24 ap24-mod_.*" :
        $name eq "dhcpd" ? "isc-dhcp42-server" :
        $name eq "mysql" ? "mysql-server" :
        $name eq "openssh" ? "openssh-portable" :