diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
index c1ff2b5..ad8ad1d 100644
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@@ -1 +1 @@
-DIST unrar-5.7.4.tar.gz 228754 BLAKE2B c17faa7c5cc2f58f1f9c105138f3a880f11aa539c9b90be261cadc94c5c3497dae302078e5d9f9df08c7ccc9b30ef324ce7449b7f8d11613422c5466d36969c5 SHA512 46087efce622e45f63b776c51856bf35599863dee164dd149df0dcac18b1b5c912e0419430ceb753c03493307ed1978be8cad51b1d69dca8fcc9bc66b9ea3a58
+DIST unrar-5.9.4.tar.gz 229921 BLAKE2B d87189a6b6b3566a0efac7f72e40732ff673cdcac6f4fdaa96b5a771025f02779d74e2822053681477b3490f45817196673aa5707846767c4061ca95718557a1 SHA512 4c026bc12c38314c7df6e1b2f296be681fffa4ba525e378809063519cb5d51889fe8d3cbce16e802023354f02b45b1bcc672b79a6fa81b4baa13a374ce22c8f1
diff --git a/app-arch/unrar/files/unrar-5.5.5-build.patch b/app-arch/unrar/files/unrar-5.9.3-build.patch
similarity index 76%
rename from app-arch/unrar/files/unrar-5.5.5-build.patch
rename to app-arch/unrar/files/unrar-5.9.3-build.patch
index 5d69a25..d9cbcfd 100644
--- a/app-arch/unrar/files/unrar-5.5.5-build.patch
+++ b/app-arch/unrar/files/unrar-5.9.3-build.patch
@@ -6,19 +6,14 @@
 
 Gentoo-Bug: https://bugs.gentoo.org/528218
 
---- a/makefile
-+++ b/makefile
-@@ -139,23 +139,23 @@ uninstall:	uninstall-unrar
+--- unrar/makefile
++++ unrar/makefile
+@@ -142,21 +142,18 @@
+ 	@rm -f $(OBJECTS) $(UNRAR_OBJ) $(LIB_OBJ)
+ 	@rm -f unrar libunrar.*
  
- clean:
- 	@rm -f *.o *.bak *~
--
 -unrar:	clean $(OBJECTS) $(UNRAR_OBJ)
- 	@rm -f unrar
-+	@rm -f default.sfx
-+	@rm -f libunrar.so
-+	@rm -f libunrar.a
-+
+-	@rm -f unrar
 +unrar:	$(OBJECTS) $(UNRAR_OBJ)
  	$(LINK) -o unrar $(LDFLAGS) $(OBJECTS) $(UNRAR_OBJ) $(LIBS)	
  	$(STRIP) unrar
@@ -33,12 +28,8 @@
  lib:	WHAT=RARDLL
  lib:	CXXFLAGS+=$(LIBFLAGS)
 -lib:	clean $(OBJECTS) $(LIB_OBJ)
--	@rm -f libunrar.so
--	@rm -f libunrar.a
+-	@rm -f libunrar.*
 +lib:	$(OBJECTS) $(LIB_OBJ)
  	$(LINK) -shared -o libunrar.so $(LDFLAGS) $(OBJECTS) $(LIB_OBJ)
  	$(AR) rcs libunrar.a $(OBJECTS) $(LIB_OBJ)
  
--- 
-2.13.1
-
diff --git a/app-arch/unrar/unrar-5.7.4.ebuild b/app-arch/unrar/unrar-5.9.4.ebuild
similarity index 86%
rename from app-arch/unrar/unrar-5.7.4.ebuild
rename to app-arch/unrar/unrar-5.9.4.ebuild
index f1fd7f5..a24399d 100644
--- a/app-arch/unrar/unrar-5.7.4.ebuild
+++ b/app-arch/unrar/unrar-5.9.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 inherit flag-o-matic multilib toolchain-funcs
 
@@ -19,10 +19,10 @@
 
 RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
 
-S=${WORKDIR}/unrar
+S="${WORKDIR}/unrar"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-5.5.5-build.patch
+	"${FILESDIR}"/${PN}-5.9.3-build.patch
 	"${FILESDIR}"/${PN}-5.5.5-honor-flags.patch
 )
 
@@ -46,7 +46,7 @@
 
 src_compile() {
 	unrar_make() {
-		emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
+		emake AR="$(tc-getAR)" CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
 	}
 
 	unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib
@@ -66,5 +66,5 @@
 	doins *.hpp
 	dosym libunrar${PV%.*.*} /usr/include/libunrar
 
-	find "${ED}" -name "*.a" -delete || die
+	find "${ED}" -type f -name "*.a" -delete || die
 }
diff --git a/metadata/md5-cache/app-arch/unrar-5.7.4 b/metadata/md5-cache/app-arch/unrar-5.7.4
deleted file mode 100644
index 94d353b..0000000
--- a/metadata/md5-cache/app-arch/unrar-5.7.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DESCRIPTION=Uncompress rar files
-EAPI=6
-HOMEPAGE=https://www.rarlab.com/rar_add.htm
-KEYWORDS=*
-LICENSE=unRAR
-RDEPEND=!<=app-arch/unrar-gpl-0.0.1_p20080417
-SLOT=0/5
-SRC_URI=https://www.rarlab.com/rar/unrarsrc-5.7.4.tar.gz -> unrar-5.7.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2db08dd530c66f29cf25974fc5c16945
diff --git a/metadata/md5-cache/app-arch/unrar-5.9.4 b/metadata/md5-cache/app-arch/unrar-5.9.4
new file mode 100644
index 0000000..51de422
--- /dev/null
+++ b/metadata/md5-cache/app-arch/unrar-5.9.4
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare
+DESCRIPTION=Uncompress rar files
+EAPI=7
+HOMEPAGE=https://www.rarlab.com/rar_add.htm
+KEYWORDS=*
+LICENSE=unRAR
+RDEPEND=!<=app-arch/unrar-gpl-0.0.1_p20080417
+SLOT=0/5
+SRC_URI=https://www.rarlab.com/rar/unrarsrc-5.9.4.tar.gz -> unrar-5.9.4.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=4432bd2b2a437ad248a6fb4ed5eaf50e