diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest
index 4655daf..5c3633c 100644
--- a/x11-wm/windowmaker/Manifest
+++ b/x11-wm/windowmaker/Manifest
@@ -1,3 +1,3 @@
 AUX wmaker.desktop 206 BLAKE2B 62fe60afde032c1f37c5c818bc37a97d70605e041e539e922f18d56a7582fffd1689762f600fa3c69c5b62dd399867c8c1208d393060e734b38a84540143bf79 SHA512 d1dc99aa29047434e1265c8f93ce366b7c026f27eec8a166904fda1ab4144e0d6142807ac09ba6cbcb86480257893e5553046a0ba1a8e1d6315f23dd8468482b
 DIST WindowMaker-extra-0.1.tar.gz 238018 BLAKE2B 865b12975d0cdefc1f05a76344b449fdcf8a2841d6a7adf1ab6435857d89cbc4fda22bb62432a1bbba921267380d00a0cded718bfbd344bbb5e6207e59b76096 SHA512 0fe9b3ffc093942db167d8a01e15c0f6741f3a40959d1434ea4f23e7b9d4a9c13935a61eabef9691e5fdfd4e407564caafce15c2d65d66499960a6764a874ab8
-EBUILD windowmaker-7777.ebuild 3057 BLAKE2B 21615643168093c1bb7ca569738d8dd285e251dffdd0d84619ae964e77faf6bbf6c8dcefd861dd9408b471b365a516eb643f04e78c844195e0b47ad6b51e4ad6 SHA512 7ea530b7fe7f2290344a66a959bd94ae3ab9e1338e7d0f8926016951c9d30bd65bf3ae9b2310e5cd5adea1989dd894b9ff309ed647f60f38bde22e5f4d08d307
+EBUILD windowmaker-7777.ebuild 2986 BLAKE2B 0d582374f9b4c4749e6d2090984d1958f2d6fec36aae03be5b76458e41ce483eafc5ab6f85fec1efc6ed498b46780fe2c7b73f265f9a9b21f642e5e83d694679 SHA512 9f56b9aa6374ec6ff46fcb931d3e3df1760c67b666c648e926c89f8a0c977b46b15df34347f78921610d5028cd12d30839a5bdc672154fbc9f0d3ed0a96c6a33
diff --git a/x11-wm/windowmaker/windowmaker-7777.ebuild b/x11-wm/windowmaker/windowmaker-7777.ebuild
index 1633f7e..f3ec437 100644
--- a/x11-wm/windowmaker/windowmaker-7777.ebuild
+++ b/x11-wm/windowmaker/windowmaker-7777.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit autotools eutils git-r3
 
 DESCRIPTION="The fast and light GNUstep window manager - gryf's personal ebuild"
@@ -52,8 +52,6 @@ src_prepare() {
 		fi;
 	done;
 
-
-
 	default
 	eautoreconf
 }
@@ -83,7 +81,7 @@ src_configure() {
 		--localedir="${EPREFIX}"/usr/share/locale \
 		${myconf}
 
-	cd ../WindowMaker-extra-0.1
+	pushd ../WindowMaker-extra-0.1 || die
 	econf
 }
 
@@ -91,18 +89,15 @@ src_compile() {
 	emake
 
 	# WindowMaker Extra Package (themes and icons)
-	cd ../WindowMaker-extra-0.1
+	pushd ../WindowMaker-extra-0.1 || die
 	emake
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS BUGFORM BUGS ChangeLog INSTALL* FAQ* \
-		README* NEWS TODO
+	default
 
 	# WindowMaker Extra
-	cd ../WindowMaker-extra-0.1
+	pushd ../WindowMaker-extra-0.1 || die
 	emake DESTDIR="${D}" install
 
 	newdoc README README.extra