diff --git a/sys-apps/v86d/files/00000000-atomic_t.patch b/sys-apps/v86d/files/00000000-atomic_t.patch
deleted file mode 100644
index 58bed7a..0000000
--- a/sys-apps/v86d/files/00000000-atomic_t.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- v86d-0.1.10-orig/v86.h
-+++ v86d-0.1.10/v86.h
-@@ -19,6 +19,8 @@
- 
- struct completion;
- 
-+typedef struct { int counter; } atomic_t;
-+
- #include <video/uvesafb.h>
- 
- //#define ulog(args...)	do {} while (0)
diff --git a/sys-apps/v86d/v86d-0.1.10-r1.ebuild b/sys-apps/v86d/v86d-0.1.10.ebuild
similarity index 77%
rename from sys-apps/v86d/v86d-0.1.10-r1.ebuild
rename to sys-apps/v86d/v86d-0.1.10.ebuild
index b8b9637..50e0c65 100644
--- a/sys-apps/v86d/v86d-0.1.10-r1.ebuild
+++ b/sys-apps/v86d/v86d-0.1.10.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=2
 
-inherit autotools eutils flag-o-matic linux-info multilib
+inherit eutils flag-o-matic linux-info multilib
 
 DESCRIPTION="A daemon to run x86 code in an emulated environment"
 HOMEPAGE="https://dev.gentoo.org/~spock/projects/uvesafb/"
-SRC_URI="https://github.com/mjanusz/${PN}/archive/${P}.tar.gz"
-
+#SRC_URI="https://dev.gentoo.org/~spock/projects/uvesafb/archive/${P/_/-}.tar.bz2"
+SRC_URI="https://moriya.zapto.org/attachments/2398f657-3213-4e79-a42d-c23588db399a -> ${P/_/-}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -17,10 +17,7 @@ IUSE="debug x86emu"
 DEPEND="dev-libs/klibc"
 RDEPEND=""
 
-PATCHES=( "${FILESDIR}/00000000-atomic_t.patch" )
-
-MY_PN=${PN/v/}
-S="${WORKDIR}/${PN}-${MY_PN}-${PV}"
+S="${WORKDIR}/${P//_*/}"
 
 pkg_setup() {
 	linux-info_pkg_setup
@@ -32,7 +29,6 @@ src_prepare() {
 		eerror "prior to merging this package."
 		die "Kernel not patched with uvesafb."
 	fi
-	default
 }
 
 src_configure() {
@@ -42,7 +38,6 @@ src_configure() {
 src_compile() {
 	# Disable stack protector, as it does not work with klibc (bug #346397).
 	filter-flags -fstack-protector -fstack-protector-all
-	#append-cflags "-nostdinc -I/usr/include -I/usr/local/include"
 	emake KDIR="${KV_DIR}" || die
 }