diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog
index fb138188..368ed564 100644
--- a/www-servers/apache/ChangeLog
+++ b/www-servers/apache/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  16 Jun 2008; Mario Fetka <mario-fetka@gmx.at> +apache-2.2.9-r100.ebuild:
+  Bump
+
   11 Jun 2008; Mario Fetka <mario-fetka@gmx.at>
   -files/apache-2.2.6-r102.patch, -apache-2.2.6-r99.ebuild,
   -apache-2.2.6-r102.ebuild, -apache-2.2.6-r103.ebuild,
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index 43675fc1..e9f652c8 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -1,7 +1,10 @@
 DIST gentoo-apache-2.2.8-r102-20080322.tar.bz2 60079 RMD160 18b26ce4133af24ed2c325db9e22a119b097a057 SHA1 6c4adfbb495b05d21373817a118eac6c8ff45c18 SHA256 4148cc6af2c6bd4a82149b8edebae38460ccf6d80426d9ee6dda0051f2324a9a
 DIST gentoo-apache-2.2.8-r103-20080601.tar.bz2 60597 RMD160 7fbf5a9cece5ff12994115c063dd5842616b8233 SHA1 a6fa2e6443b1131074486543aef3d163cece6413 SHA256 9742fc37174cf08401f05f56e9feae6d05bbef0731018aa183630be2ae4c9f37
+DIST gentoo-apache-2.2.9-r100-20080615.tar.bz2 60202 RMD160 a6a715bcf9ff5ebf8d8339ec8fb8b5230a008224 SHA1 042cd7a947f85023fdbd5b52f65878a04dcb4df6 SHA256 3add1a6966c73bc19935f73bc1bcb52cba506634f09abf457c5903a0c9f12991
 DIST httpd-2.2.8.tar.bz2 4799055 RMD160 0736ea9617bafaa1c8cd34ce4fc1c7a659afea57 SHA1 5074904435d3d942ce2dc96c44b07294b8eaca77 SHA256 2ad8d0db1e478838ba88a0ddaf538c7150027d937b017739fdcb3fabb96ebd39
+DIST httpd-2.2.9.tar.bz2 4943462 RMD160 8fd62ae78271aa0ded6ba2f5bfeea8c63b79060a SHA1 71715d81e7a5ace4499803df7369c78b85251083 SHA256 d76599fbcf8b3bcff2779f880fb10e4a2bc4af60f64232083c06863e40850b61
 EBUILD apache-2.2.8-r102.ebuild 5230 RMD160 d8a79cbc1253739795e1216aedf7b5561bcc00ae SHA1 1bd7106850df504cca69cb1afaf087ccae02b22e SHA256 45617eac919d7a72bf4a507fe411d67593cd8dd66a52cfa864123222449191f2
 EBUILD apache-2.2.8-r103.ebuild 5245 RMD160 bc51c57f335f04f2c871120be499a4034510273b SHA1 ba66a1ac206062bd4a3a4d565835c442adf435ae SHA256 eb98e1b0492e66b8c5ed171b8ca03ff6f3a2eaa7270af36499d8d7826532d2b2
-MISC ChangeLog 1340 RMD160 455dfb2ecc1ba8739d04c4f959a966f9cd391f27 SHA1 3484c4ca0cfc2218034eb70541e5d6991ee75631 SHA256 34de2f9a0ee520ae867cdbe4a2475379040208cfe30884043ec40213615e1d6d
+EBUILD apache-2.2.9-r100.ebuild 2758 RMD160 7c26ca1d95d32d95ae5837d07e6f43233d11659d SHA1 cdc1d83a6cb6effa9a262b61bd20694e43a5426a SHA256 f8059cf3e03879f00e4a6eb9101bf8647a3d3bff7256041670e52220bb000172
+MISC ChangeLog 1423 RMD160 298e8cd46302b7f3093e3ff6d7467bb5954a3537 SHA1 be9688e2140543bd1e1d6d0b5494ba7daf5210bc SHA256 38892dc7266de4610dd852166bb3425d7f59f512785e59f2082558bf4e23dded
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/www-servers/apache/apache-2.2.9-r100.ebuild b/www-servers/apache/apache-2.2.9-r100.ebuild
new file mode 100644
index 00000000..17404c6f
--- /dev/null
+++ b/www-servers/apache/apache-2.2.9-r100.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.9.ebuild,v 1.5 2008/06/16 07:21:15 opfer Exp $
+
+# latest gentoo apache files
+GENTOO_PATCHSTAMP="20080615"
+GENTOO_DEVELOPER="hollow"
+
+# IUSE/USE_EXPAND magic
+IUSE_MPMS_FORK="itk peruser prefork"
+IUSE_MPMS_THREAD="event worker"
+
+IUSE_MODULES="actions alias asis auth_basic auth_digest authn_alias authn_anon
+authn_dbd authn_dbm authn_default authn_file authz_dbm authz_default
+authz_groupfile authz_host authz_owner authz_user autoindex cache cern_meta
+charset_lite dav dav_fs dav_lock dbd deflate dir disk_cache dumpio env expires
+ext_filter file_cache filter headers ident imagemap include info log_config
+log_forensic logio mem_cache mime mime_magic negotiation proxy proxy_ajp
+proxy_balancer proxy_connect proxy_ftp proxy_http rewrite setenvif speling
+status substitute unique_id userdir usertrack version vhost_alias"
+
+# inter-module dependencies
+# TODO: this may still be incomplete
+MODULE_DEPENDS="
+	dav_fs:dav
+	dav_lock:dav
+	deflate:filter
+	disk_cache:cache
+	ext_filter:filter
+	file_cache:cache
+	log_forensic:log_config
+	logio:log_config
+	mem_cache:cache
+	mime_magic:mime
+	proxy_ajp:proxy
+	proxy_balancer:proxy
+	proxy_connect:proxy
+	proxy_ftp:proxy
+	proxy_http:proxy
+	substitute:filter
+"
+
+# module<->define mappings
+MODULE_DEFINES="
+	auth_digest:AUTH_DIGEST
+	authnz_ldap:AUTHNZ_LDAP
+	cache:CACHE
+	dav:DAV
+	dav_fs:DAV
+	dav_lock:DAV
+	disk_cache:CACHE
+	file_cache:CACHE
+	info:INFO
+	ldap:LDAP
+	mem_cache:CACHE
+	proxy:PROXY
+	proxy_ajp:PROXY
+	proxy_balancer:PROXY
+	proxy_connect:PROXY
+	proxy_ftp:PROXY
+	proxy_http:PROXY
+	ssl:SSL
+	status:STATUS
+	suexec:SUEXEC
+	userdir:USERDIR
+"
+
+# critical modules for the default config
+MODULE_CRITICAL="
+	authz_host
+	dir
+	mime
+"
+
+inherit apache-2
+
+DESCRIPTION="The Apache Web Server."
+HOMEPAGE="http://httpd.apache.org/"
+
+# some helper scripts are Apache-1.1, thus both are here
+LICENSE="Apache-2.0 Apache-1.1"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd x86 ~x86-fbsd"
+IUSE="sni"
+
+DEPEND="${DEPEND}
+	apache2_modules_deflate? ( sys-libs/zlib )"
+
+RDEPEND="${RDEPEND}
+	apache2_modules_mime? ( app-misc/mime-types )"
+
+src_unpack() {
+	if ! use sni ; then
+		EPATCH_EXCLUDE="04_all_mod_ssl_tls_sni.patch"
+	fi
+
+	apache-2_src_unpack
+}
+
+pkg_preinst() {
+	# note regarding IfDefine changes
+	if has_version "<${CATEGORY}/${PN}-2.2.6-r1"; then
+		elog
+		elog "When upgrading from versions 2.2.6 or earlier, please be aware"
+		elog "that the define for mod_authnz_ldap has changed from AUTH_LDAP"
+		elog "to AUTHNZ_LDAP. Additionally mod_auth_digest needs to be enabled"
+		elog "with AUTH_DIGEST now."
+		elog
+	fi
+}