diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 404883b..f36eb60 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -1 +1 @@
-DIST qemu-2.3.0-rc4.tar.bz2 24690124 SHA256 1e5c52e0cc5e4aacfa1d5572c2ba38c4db3369c9dcc71f73312adf64a9d8c1a3 SHA512 092e0f70bde79b927bee45ae0ea7641c80e1762818fbc7b603386b516852de8ed844bae2567f5aa360e27e5e7aa419961541db1cbbaaf7621cf62aa27567457a WHIRLPOOL 6af409330435d1ce5bfbe928c7a91f19d6006e4e74e70bd3d2fe0fd4a8453e66aa76f19a604540e4dcac215ef7afe8d4c80a6cb9eb946cf8af1657087c964074
+DIST qemu-2.3.0.tar.bz2 24683085 SHA256 b6bab7f763d5be73e7cb5ee7d4c8365b7a8df2972c52fa5ded18893bd8281588 SHA512 7a40d213c5696b27784abd2a3119e49d42c38c923be431826c73a8f14c19074435d7f1a652686c53baf08e81f5a3005b2ddc92d67c32f6a2b19659ab627e9eaa WHIRLPOOL 9dad6e342027c3be512b4e0b40e810e0a6f1dc84a16847aa5aac74d97f7a347e60d42e770335a090f83e90a1614294f86552a84edc1faafc7093d3e32602f5de
diff --git a/app-emulation/qemu/qemu-2.3.0_rc4.ebuild b/app-emulation/qemu/qemu-2.3.0.ebuild
similarity index 98%
rename from app-emulation/qemu/qemu-2.3.0_rc4.ebuild
rename to app-emulation/qemu/qemu-2.3.0.ebuild
index bc1fb1f..8924a89 100644
--- a/app-emulation/qemu/qemu-2.3.0_rc4.ebuild
+++ b/app-emulation/qemu/qemu-2.3.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.96 2015/04/04 19:59:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.3.0.ebuild,v 1.1 2015/04/28 09:20:05 vapier Exp $
 
 EAPI=5
 
-MY_P="${P/_/-}"
+#MY_P="${P/_/-}"
 
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="ncurses,readline"
@@ -18,9 +18,8 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="git://git.qemu.org/qemu.git"
 	inherit git-2
 	SRC_URI=""
-	KEYWORDS=""
 else
-	SRC_URI="http://wiki.qemu-project.org/download/${MY_P}.tar.bz2
+	SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2
 	${BACKPORTS:+
 		http://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}"
 	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
@@ -247,10 +246,9 @@ pkg_pretend() {
 
 pkg_setup() {
 	enewgroup kvm 78
-	python_setup
 }
 
-S="${WORKDIR}/${MY_P}"
+#S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	# Alter target makefiles to accept CFLAGS set via flag-o
@@ -410,7 +408,7 @@ qemu_src_configure() {
 src_configure() {
 	local target
 
-	python_export_best
+	python_setup
 
 	softmmu_targets= softmmu_bins=()
 	user_targets= user_bins=()