--- midori-0.5.8-r1.ebuild	2014-11-18 16:33:51.528643812 +0100
+++ midori-0.5.9.ebuild	2014-11-18 16:33:41.839643526 +0100
@@ -15,8 +15,7 @@
 	_live_inherits=git-2
 else
 	KEYWORDS="~amd64 ~arm ~mips ~x86 ~x86-fbsd"
-	SRC_URI="http://www.${PN}-browser.org/downloads/${PN}_${PV}_all_.tar.bz2
-		http://dev.gentoo.org/~ssuominen/${P}-save_as.patch.xz"
+	SRC_URI="http://www.${PN}-browser.org/downloads/${PN}_${PV}_all_.tar.bz2"
 fi
 
 inherit eutils fdo-mime gnome2-utils pax-utils python-any-r1 cmake-utils vala ${_live_inherits}
@@ -59,7 +58,7 @@
 	introspection? ( deprecated )
 	webkit2? ( !deprecated )"
 
-S=${WORKDIR}
+S=${WORKDIR}/${P}
 
 pkg_setup() {
 	python-any-r1_pkg_setup
@@ -74,7 +73,6 @@
 }
 
 src_prepare() {
-	epatch "${WORKDIR}"/${P}-save_as.patch #498898
 	vala_src_prepare
 	sed -i -e '/install/s:COPYING:HACKING TODO TRANSLATE:' CMakeLists.txt || die
 }