diff --git a/media-video/asfrecorder/asfrecorder-1.1-r1.ebuild b/media-video/asfrecorder/asfrecorder-1.1-r2.ebuild
similarity index 50%
rename from media-video/asfrecorder/asfrecorder-1.1-r1.ebuild
rename to media-video/asfrecorder/asfrecorder-1.1-r2.ebuild
index bcb8f73a2cf75..4affdf5ebb9ae 100644
--- a/media-video/asfrecorder/asfrecorder-1.1-r1.ebuild
+++ b/media-video/asfrecorder/asfrecorder-1.1-r2.ebuild
@@ -1,14 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs
 
 MY_PN="${PN/asfr/ASFR}"
+
 DESCRIPTION="Linux WindowsMedia streaming client"
 HOMEPAGE="https://sourceforge.net/projects/asfrecorder/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}.zip"
+SRC_URI="mirror://gentoo/${MY_PN}.zip"
+S="${WORKDIR}/${MY_PN}"
 
 LICENSE="public-domain"
 SLOT="0"
@@ -16,17 +18,16 @@ KEYWORDS="~amd64 ppc x86 ~x86-linux ~ppc-macos"
 
 BDEPEND="app-arch/unzip"
 
-S=${WORKDIR}/${MY_PN}
+PATCHES=(
+	"${FILESDIR}"/${P}-headers.patch
+)
 
 src_compile() {
-	# There is a Makefile, but it only works for Cygwin, so we
-	# only compile this single program.
-	cd "${S}"/source || die
-	$(tc-getCC) -o ${PN} ${CFLAGS} ${LDFLAGS} ${PN}.c || die "Build failed"
+	tc-export CC
+	emake -C source ${PN}
 }
 
 src_install() {
-	# Again, no makefiles, so just take what we want.
 	dobin source/${PN}
-	dodoc README.TXT
+	einstalldocs
 }
diff --git a/media-video/asfrecorder/files/asfrecorder-1.1-headers.patch b/media-video/asfrecorder/files/asfrecorder-1.1-headers.patch
new file mode 100644
index 0000000000000..4da22e2d662c1
--- /dev/null
+++ b/media-video/asfrecorder/files/asfrecorder-1.1-headers.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/874558
+--- a/source/asfrecorder.c
++++ b/source/asfrecorder.c
+@@ -127,2 +127,7 @@
+ #include <time.h>
++#include <ctype.h>
++#include <unistd.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
++#include <arpa/inet.h>
+