diff --git a/app-emulation/ganeti/Manifest b/app-emulation/ganeti/Manifest
index b0bbfff..721bad2 100644
--- a/app-emulation/ganeti/Manifest
+++ b/app-emulation/ganeti/Manifest
@@ -1,8 +1,11 @@
 AUX ganeti-2.1.initd 2014 RMD160 44996bf7d50b8ac70df572daafa5f5d04be021a8 SHA1 ceda61da3b3099292f4cd5ab41b5e02f2666dc6b SHA256 37fd18b914846e5fb8d984db7162b230ac3488ec530aaddda7b63bd72cc70117
+AUX ganeti-fix-start-stop.patch 1440 RMD160 50db2c5a3436267640573a30c339f5103f74fc2e SHA1 a89fc90c24e1a589e106ef48df530deaf57d0182 SHA256 5b2beddaa862cec4b7ea7a08c8d04fb3a42db1df0d632f5d158e9ecbf4b47af3
 AUX ganeti-kvm-poweroff.confd 186 RMD160 87242c3c785e012b2ec7534836dabd8017a25893 SHA1 955bdc02481591c06d8e00f1b6e04c55830e1150 SHA256 d811f1825351b03653aed4b6827b2b0c9dd1dc3340c980862c0758b3bf5ad21e
 AUX ganeti-kvm-poweroff.initd 1621 RMD160 2d8d59ac9bf25ff6efa74a3277f4d295c05d4282 SHA1 7e3cbfb9f6ed988393522af6569a96c66cb4feb0 SHA256 bb7b6ab5ac2899969bab52d9c5e1c5d9fd9629d247563ff74e8b9f64a4478e28
 AUX ganeti.confd 248 RMD160 18662964365f102e77f593429bb0772d94c65267 SHA1 337999b3fbeb64518f3d39c41634e3f414aedb25 SHA256 7efc3a5052ad5c2085605a8c0bf9e9bb9cf20c0623263b7abcd0b7a0cb9a895b
 AUX ganeti.initd 1159 RMD160 3d3f56cbef2852625abdfc7f47d711b844c42780 SHA1 c74485c40329cdd129eeebfdb38f47973dd4b3a5 SHA256 86f30236349528647e7b78d2e72963e9cda5f6998ebb314e44387bef5eab1f66
 AUX ganeti2.initd 1503 RMD160 4af84c353f6638af31a94a5274e922237ae2fd00 SHA1 a46268352d11fb6450362c9a0d72655ded6b5b6f SHA256 6fd666648ac543ffcc3700821a36eba9a027eb04278e53f60e07ce8989de3fb8
 DIST ganeti-2.4.3.tar.gz 1826541 RMD160 3b696e2af48adc7ccbbbe6e0dd9c63ccd8525302 SHA1 72cd24f299a8e444369fe235e57209709f6880e8 SHA256 44742bb2ef87895730e6a869a83d4a3b6a62df3a437eb0acd594fd21df78421d
+DIST ganeti-2.5.0~rc5.tar.gz 2287511 RMD160 612ae14fe89cc0a9beb176631fdc3b507571cacc SHA1 88868990ea0e57e4fa399291e8727c92cdc4c744 SHA256 83948a33fcb3e7e7cc4acff40fedb6a50b8dd8e594333b28cd41c9f65a97990b
 EBUILD ganeti-2.4.3.ebuild 2404 RMD160 15ba8fef47929ad3f1038966b770fbeed8267fc3 SHA1 a6020d1c327902599ce981d9f9bb5f3b731324cb SHA256 77150e37b744e456104878828ac8bd8cc81127bee113b021ba83e03ec1803f6c
+EBUILD ganeti-2.5.0_rc5.ebuild 3384 RMD160 6716a891c50b92306728133b8e800ea6362c1352 SHA1 c12d45d19635d9c437c6f9a511bc9f421e0d2ea2 SHA256 e2f64aa2a49cc1cf99c8e8061bb8e4b135228a12e1a7d21aca9f3ac36b703a1f
diff --git a/app-emulation/ganeti/files/ganeti-fix-start-stop.patch b/app-emulation/ganeti/files/ganeti-fix-start-stop.patch
new file mode 100644
index 0000000..e53161a
--- /dev/null
+++ b/app-emulation/ganeti/files/ganeti-fix-start-stop.patch
@@ -0,0 +1,47 @@
+From 9f8f304c983635e0ead6adadd1c4a62be6e92e01 Mon Sep 17 00:00:00 2001
+From: Lance Albertson <ramereth@gmail.com>
+Date: Mon, 8 Aug 2011 23:34:33 -0700
+Subject: [PATCH] Remove/fix deprecated start-stop-daemon functions
+
+daemon-util uses the deprecated functions --startas, --chuid and, most
+importantly, --oknodo. The last one causes start-stop-daemon to exit with a
+non-zero status, which makes openrc think it crashed (when in reality it just
+shut down properly) [1].
+
+[1] https://bugs.gentoo.org/show_bug.cgi?id=377905
+
+Signed-off-by: Lance Albertson <ramereth@gmail.com>
+---
+ daemons/daemon-util.in |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/daemons/daemon-util.in b/daemons/daemon-util.in
+index 819fd6b..00fe1b6 100644
+--- a/daemons/daemon-util.in
++++ b/daemons/daemon-util.in
+@@ -172,10 +172,10 @@ start() {
+ 
+   @PKGLIBDIR@/ensure-dirs
+ 
+-  start-stop-daemon --start --quiet --oknodo \
++  start-stop-daemon --start --quiet \
+     --pidfile $(_daemon_pidfile $name) \
+-    --startas $(_daemon_executable $name) \
+-    --chuid $(_daemon_usergroup $plain_name) \
++    --exec $(_daemon_executable $name) \
++    --user $(_daemon_usergroup $plain_name) \
+     -- $args "$@"
+ }
+ 
+@@ -188,7 +188,7 @@ stop() {
+ 
+   local name="$1"; shift
+ 
+-  start-stop-daemon --stop --quiet --oknodo --retry 30 \
++  start-stop-daemon --stop --quiet --retry 30 \
+     --pidfile $(_daemon_pidfile $name)
+ }
+ 
+-- 
+1.7.4.1
+
diff --git a/app-emulation/ganeti/ganeti-2.5.0_rc5.ebuild b/app-emulation/ganeti/ganeti-2.5.0_rc5.ebuild
new file mode 100644
index 0000000..4532075
--- /dev/null
+++ b/app-emulation/ganeti/ganeti-2.5.0_rc5.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.5.0_rc1.ebuild,v 1.1 2011/10/04 15:52:30 ramereth Exp $
+
+EAPI="4"
+
+inherit eutils confutils bash-completion
+
+MY_PV="${PV/_rc/~rc}"
+#MY_PV="${PV/_beta/~beta}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.ganeti.org/ganeti.git"
+	inherit git-2
+	KEYWORDS=""
+	# you will need to pull in the haskell overlay for pandoc
+	GIT_DEPEND="app-text/pandoc
+		dev-python/docutils
+		dev-python/sphinx
+		media-libs/gd[fontconfig,jpeg,png,truetype]
+		media-gfx/graphviz
+		media-fonts/urw-fonts"
+else
+	SRC_URI="http://ganeti.googlecode.com/files/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Ganeti is a virtual server management software tool"
+HOMEPAGE="http://code.google.com/p/ganeti/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="kvm xen lxc drbd +filestorage sharedstorage htools syslog ipv6"
+
+S="${WORKDIR}/${MY_P}"
+
+DEPEND="xen? ( >=app-emulation/xen-3.0 )
+	kvm? ( app-emulation/qemu-kvm )
+	lxc? ( app-emulation/lxc )
+	drbd? ( >=sys-cluster/drbd-8.3 )
+	ipv6? ( net-misc/ndisc6 )
+	htools? (
+		>=dev-lang/ghc-6.10
+		dev-haskell/json
+		dev-haskell/curl
+		dev-haskell/network
+		|| (
+			dev-haskell/parallel:1
+			dev-haskell/parallel:2
+			)
+		dev-haskell/parallel )
+	dev-libs/openssl
+	dev-python/paramiko
+	dev-python/pyopenssl
+	>=dev-python/pyparsing-1.4.6
+	dev-python/pycurl
+	dev-python/pyinotify
+	dev-python/simplejson
+	net-analyzer/arping
+	net-misc/bridge-utils
+	net-misc/curl[ssl]
+	net-misc/openssh
+	net-misc/socat
+	sys-apps/iproute2
+	sys-fs/lvm2
+	>=sys-apps/baselayout-2.0
+	${GIT_DEPEND}"
+RDEPEND="${DEPEND}
+	!app-emulation/ganeti-htools"
+
+pkg_setup () {
+	confutils_require_any kvm xen lxc
+}
+
+src_prepare() {
+	if [[ ${PV} == "9999" ]] ; then
+		./autogen.sh
+	fi
+	epatch "${FILESDIR}/${PN}-fix-start-stop.patch"
+}
+
+src_configure () {
+	local myconf
+	if use filestorage ; then
+		myconf="--with-file-storage-dir=/var/lib/ganeti-storage/file"
+	else
+		myconf="--with-file-storage-dir=no"
+	fi
+	if use sharedstorage ; then
+		myconf="--with-shared-file-storage-dir=/var/lib/ganeti-storage/shared"
+	else
+		myconf="--with-shared-file-storage-dir=no"
+	fi
+	econf --localstatedir=/var \
+		--docdir=/usr/share/doc/${P} \
+		--with-ssh-initscript=/etc/init.d/sshd \
+		--with-export-dir=/var/lib/ganeti-storage/export \
+		--with-os-search-path=/usr/share/ganeti/os \
+		$(use_enable syslog) \
+		$(use_enable htools) \
+		$(use_enable htools htools-rapi) \
+		${myconf}
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	newinitd "${FILESDIR}"/ganeti-2.1.initd ganeti
+	newconfd "${FILESDIR}"/ganeti.confd ganeti
+	use kvm && newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff
+	use kvm && newconfd "${FILESDIR}"/ganeti-kvm-poweroff.confd ganeti-kvm-poweroff
+	dobashcompletion doc/examples/bash_completion ganeti
+	dodoc INSTALL UPGRADE NEWS README doc/*.rst
+	rm -rf "${D}"/usr/share/doc/ganeti
+	docinto examples
+	#dodoc doc/examples/{basic-oob,ganeti.cron,gnt-config-backup}
+	dodoc doc/examples/{ganeti.cron,gnt-config-backup}
+	docinto examples/hooks
+	dodoc doc/examples/hooks/{ipsec,ethers}
+
+	keepdir /var/{lib,log,run}/ganeti/
+	keepdir /usr/share/ganeti/os/
+	keepdir /var/lib/ganeti-storage/{export,file,shared}/
+}
+
+pkg_postinst () {
+	bash-completion_pkg_postinst
+}
+