diff --git a/www-apps/z-push/ChangeLog b/www-apps/z-push/ChangeLog
index 2ea1959..f364fa6 100644
--- a/www-apps/z-push/ChangeLog
+++ b/www-apps/z-push/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*z-push-1.5.4.707 (25 Jul 2011)
+*z-push-1.5.3.685 (25 Jul 2011)
+
+  25 Jul 2011; Mario Fetka <mario.fetka@gmail.com> +z-push-1.5.3.685.ebuild,
+  +z-push-1.5.4.707.ebuild:
+  Bump
+
 *z-push-1.5.2 (19 Jun 2011)
 
   19 Jun 2011; Mario Fetka <mario.fetka@gmail.com> +z-push-1.5.2.ebuild,
diff --git a/www-apps/z-push/Manifest b/www-apps/z-push/Manifest
index bbbf8c3..1d60a0d 100644
--- a/www-apps/z-push/Manifest
+++ b/www-apps/z-push/Manifest
@@ -1,6 +1,10 @@
 AUX postinstall-en.txt 1221 RMD160 f180070f3c0a05330041f57f58f61be377dd34a4 SHA1 9b10d58bed5b185649157f786e14ec3253437ee9 SHA256 e7b4e230a6aa4fe5d36ae0be9386a8dde99806c24459bd50f8e87e81bdb3a7a9
 AUX postupgrade-en.txt 931 RMD160 f3fa592617e3936446dcec226d61bfec5bf94f6b SHA1 2bcb0b7601b809fa9ff7f2801e7255dc29d62a5c SHA256 b2327357aec4043a349314b31a40e2e2702d4898bcc1be34daf1567f1f28cca3
 DIST z-push-1.5.2.tar.gz 161024 RMD160 69a48c8f236e72c95a233fb097b0715597544c9b SHA1 c551283ea6e03276fdff959fe60d9f0063830d10 SHA256 735097dc3e5872215cbe20f93cd4cb0d782e3730018130bbcfdb1aa0247ed65d
+DIST z-push-1.5.3-685.tar.gz 161849 RMD160 49e1eef81fe1dbebbd157733f30f8eadd894031e SHA1 d7c6b22b5f1fd3343e04cd0c0091e60a56b1e8b8 SHA256 fe72785d3259085abdb967f0a12b2beaf64a6ed1c588557249c2ad80112d08c5
+DIST z-push-1.5.4-707.tar.gz 162385 RMD160 d55993884957f9a371284b4b1b93bb93da4e0308 SHA1 89f48356f942a003cb412e51478386c454b8f562 SHA256 f3040f804679a6ce2e34ed9f9de4082c9783aa66df051a263026b71e59252dc4
 EBUILD z-push-1.5.2.ebuild 832 RMD160 acd458a7dd0fc5e304ecf5988c31430b81b002ee SHA1 ac3e218352d58aeb2cbf83b7f111720f150c6596 SHA256 21e50e9e4cbbdf1dacd1ac2525719c172af9d4031c9e78ce04674d34bd2ba804
-MISC ChangeLog 307 RMD160 1e3e4e97fa27d3fec1f9536ab282119b9a486925 SHA1 6952106c2553e64eafa67e2b1bb4e3d747fbabc7 SHA256 7cf60d4cf2efe78e2bf4ee62a80fd27eeddfde7aef0d5ceb2b59682e94537b05
+EBUILD z-push-1.5.3.685.ebuild 908 RMD160 4e4eab0f0a5e36b657a7820c232e0e5800cb49fa SHA1 c1f4f6500328432bf27dcff7f2f17320a21f1116 SHA256 95519c4d4a6913dc89563873dc493dd3f6c2536c8db3a53d048cf60d61e32f2f
+EBUILD z-push-1.5.4.707.ebuild 908 RMD160 4e4eab0f0a5e36b657a7820c232e0e5800cb49fa SHA1 c1f4f6500328432bf27dcff7f2f17320a21f1116 SHA256 95519c4d4a6913dc89563873dc493dd3f6c2536c8db3a53d048cf60d61e32f2f
+MISC ChangeLog 485 RMD160 0b431c38cc5c1fc575ed96b9efacc8e5bbf10fe1 SHA1 e77b362fee4f04c03765bad230d8c3e31ac67523 SHA256 3b7495ab0d787cb8f339c9ab73abb6f5b05598e434cfb74bbd8de4a36457afdb
 MISC metadata.xml 233 RMD160 3caf40e55fe36d4fed694c242d1497eb27a1b1f8 SHA1 b7b9db4ee37dfe2fd40cb4944c568ae5d512158e SHA256 4eb836fc2d96512595bf637662ecca90ff28d126415b9be2ac0e8292adb48850
diff --git a/www-apps/z-push/z-push-1.5.3.685.ebuild b/www-apps/z-push/z-push-1.5.3.685.ebuild
new file mode 100644
index 0000000..14e4d33
--- /dev/null
+++ b/www-apps/z-push/z-push-1.5.3.685.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit webapp depend.php versionator
+
+MY_PV=$(replace_version_separator 3 '-'  )
+
+DESCRIPTION="Z-Push is an implementation of the ActiveSync protocol."
+HOMEPAGE="http://z-push.sourceforge.net/"
+SRC_URI="mirror://berlios/${PN}/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="AGPL-3"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="|| ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 )"
+
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+need_php_httpd
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc INSTALL LICENSE
+	rm -f INSTALL LICENSE
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_serverowned "${MY_HTDOCSDIR}"/state
+
+	webapp_configfile  "${MY_HTDOCSDIR}"/config.php
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_postupgrade_txt en "${FILESDIR}"/postupgrade-en.txt
+
+	webapp_src_install
+}
diff --git a/www-apps/z-push/z-push-1.5.4.707.ebuild b/www-apps/z-push/z-push-1.5.4.707.ebuild
new file mode 100644
index 0000000..14e4d33
--- /dev/null
+++ b/www-apps/z-push/z-push-1.5.4.707.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit webapp depend.php versionator
+
+MY_PV=$(replace_version_separator 3 '-'  )
+
+DESCRIPTION="Z-Push is an implementation of the ActiveSync protocol."
+HOMEPAGE="http://z-push.sourceforge.net/"
+SRC_URI="mirror://berlios/${PN}/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="AGPL-3"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="|| ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 )"
+
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+need_php_httpd
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc INSTALL LICENSE
+	rm -f INSTALL LICENSE
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_serverowned "${MY_HTDOCSDIR}"/state
+
+	webapp_configfile  "${MY_HTDOCSDIR}"/config.php
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_postupgrade_txt en "${FILESDIR}"/postupgrade-en.txt
+
+	webapp_src_install
+}