diff --git a/www-apps/davical/ChangeLog b/www-apps/davical/ChangeLog
index 8d9fbc5..8959618 100644
--- a/www-apps/davical/ChangeLog
+++ b/www-apps/davical/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  09 May 2010; Mario Fetka <mario.fetka@gmail.com> davical-0.9.8.ebuild,
+  +davical-0.9.9.ebuild:
+  Bump
+
   31 Jan 2010; Mario Fetka <mario.fetka@gmail.com> +davical-0.9.8.ebuild:
   initial checkin based on sunrise ebuild
 
diff --git a/www-apps/davical/Manifest b/www-apps/davical/Manifest
index 4d9670a..5690a65 100644
--- a/www-apps/davical/Manifest
+++ b/www-apps/davical/Manifest
@@ -1,6 +1,8 @@
 AUX postinstall-en-0.9.8.txt 492 RMD160 31bf31bfd7a3937d444844c3742b549b77d9de79 SHA1 5edf6c9c2fd1047be370a584f0f7d9a0dec17498 SHA256 da31aedbd3508422ccb8715e2958651ea430a95408c4ccd27a6fd1a03eb10ecc
 AUX rscds.conf 11907 RMD160 bdd38b174cf76e2a2ea76da5ed09706d000ccd20 SHA1 12da666505dd8fb814e775f21f9bc7e623dc7597 SHA256 25d27389f72caf07e9c008bd1cfe791eac69a85309ab226946d9d7e4304ec9b7
 DIST davical-0.9.8.tar.gz 1840965 RMD160 cb6ed25786fab3c7f9f0938fd146f28a2e661f57 SHA1 8fe11041881d53e3a256ddf915b577d658b7d4db SHA256 f474a3a685d4b018306bc15f24acf5f8cc990be0c0c48dabfaed5126ce4b06d7
-EBUILD davical-0.9.8.ebuild 1700 RMD160 d554c18848a94696a0c83da4390adc71d84418f5 SHA1 92ea51d5570bacd9fe7c2ccdb56ca9da6b08be34 SHA256 3019b9a01153426395b0aa6d1c10fa634b1a86d173f9de364a657a2a98ef3789
-MISC ChangeLog 2879 RMD160 dbf763794b1101e08242c76df5a40dc47325c7c5 SHA1 f92e463939887ce6414d9d70199ecf9977ad7835 SHA256 b993c1714bc426a4f418585aa30497e4738e8652374299dfcc1d404209683144
+DIST davical-0.9.9.tar.gz 1949981 RMD160 74a4abecd7527b09e425dbff4b5c1cf845670205 SHA1 c1ec44757a769a5c999c8348958a8a6ad59379fc SHA256 9052f844b8b1139d62ec9f1cc8cb31a4f34d86b783476fe674148fe6fd99c96c
+EBUILD davical-0.9.8.ebuild 1731 RMD160 a44149a71f98759b7927fb51bce4b567eb181536 SHA1 f79e7acd1d9199b98173392ebba0eee648b51352 SHA256 50a770dfe2d0c86f32fc63781c453eb3e1be7143995f0fd67ebd4fb37f81a9b6
+EBUILD davical-0.9.9.ebuild 1731 RMD160 a44149a71f98759b7927fb51bce4b567eb181536 SHA1 f79e7acd1d9199b98173392ebba0eee648b51352 SHA256 50a770dfe2d0c86f32fc63781c453eb3e1be7143995f0fd67ebd4fb37f81a9b6
+MISC ChangeLog 2985 RMD160 43417838d3c9b4c16631fd12a8edabf83b9e26f0 SHA1 ba3ecd6bb8db8c543345696a7c3e8fb9b9bb19c6 SHA256 a78387155e4458e60b3be2b2c78aafc34617538a0a49df6fa5d4a7c19df80fd0
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/www-apps/davical/davical-0.9.8.ebuild b/www-apps/davical/davical-0.9.8.ebuild
index a6624bc..3460341 100644
--- a/www-apps/davical/davical-0.9.8.ebuild
+++ b/www-apps/davical/davical-0.9.8.ebuild
@@ -16,7 +16,7 @@ IUSE="doc vhosts"
 
 DEPEND="doc? ( dev-php/PEAR-PhpDocumentor )"
 RDEPEND="www-servers/apache
-	dev-lang/php[pcre,pdo,postgres,xml]
+	|| ( <dev-lang/php-5.3[pcre,pdo,postgres,xml] >=dev-lang/php-5.3 )
 	app-admin/pwgen
 	>=dev-php/awl-0.39
 	dev-perl/yaml
diff --git a/www-apps/davical/davical-0.9.9.ebuild b/www-apps/davical/davical-0.9.9.ebuild
new file mode 100644
index 0000000..3460341
--- /dev/null
+++ b/www-apps/davical/davical-0.9.9.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit webapp depend.php
+
+DESCRIPTION="A CalDAV and iCal server"
+HOMEPAGE="http://davical.org/"
+SRC_URI="http://debian.mcmillan.net.nz/packages/davical/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc vhosts"
+
+DEPEND="doc? ( dev-php/PEAR-PhpDocumentor )"
+RDEPEND="www-servers/apache
+	|| ( <dev-lang/php-5.3[pcre,pdo,postgres,xml] >=dev-lang/php-5.3 )
+	app-admin/pwgen
+	>=dev-php/awl-0.39
+	dev-perl/yaml
+	dev-perl/DBI
+	dev-perl/DBD-Pg"
+
+need_php5
+need_httpd
+
+src_compile() {
+	if use doc ; then
+		ebegin "Generating documentation"
+		phpdoc -c "docs/api/phpdoc.ini"
+		eend $? || die "Documentation failed to build"
+	fi
+	emake inc/always.php || die "emake failed"
+	scripts/po/rebuild-translations.sh
+}
+
+src_install() {
+	webapp_src_preinst
+
+	local docs="INSTALL README debian/README.Debian \
+		testing/README.regression_tests \
+		TODO debian/changelog"
+	dodoc-php ${docs} || die "dodoc failed"
+
+	einfo "Installing main files"
+	local dirs="htdocs inc locale"
+	insinto "${MY_HTDOCSDIR}"
+	doins -r ${dirs} || die "doins failed"
+
+	einfo "Installing sql files"
+	insinto "${MY_SQLSCRIPTSDIR}"
+	doins -r dba/* || die "doins failed"
+
+	if use doc ; then
+		einfo "Installing documentation"
+		dohtml -r "docs/api/" || die "dohtml failed"
+		dohtml -r "docs/website/" || die "dohtml failed"
+	fi
+
+	insinto /etc/${PN}
+	newins "${FILESDIR}/rscds.conf" calendar.example.com-conf.php \
+		|| die "newins failed"
+
+	webapp_postinst_txt en "${FILESDIR}/postinstall-en-${PV}.txt"
+	webapp_src_install
+
+	fperms +x "${MY_SQLSCRIPTSDIR}/create-database.sh"
+	fperms +x "${MY_SQLSCRIPTSDIR}/update-davical-database"
+
+}