diff --git a/net-wireless/wavemon/Manifest b/net-wireless/wavemon/Manifest
index 40faaa6..4a84f0c 100644
--- a/net-wireless/wavemon/Manifest
+++ b/net-wireless/wavemon/Manifest
@@ -1 +1 @@
-DIST wavemon-0.9.3.tar.gz 220372 BLAKE2B 383e5462e6f3abf86b3604499764060927321018f9dfaef9b742d933e832e568249e41f348788184e125324f81672f2f2b2ff9ca970c215f95a80ec140e0ca11 SHA512 0e4f6db1dfd1915a3c0e1c9708eea501d7180e80df891d0c5a59bb72d48777731c67a256d2d7d6c748ade8e1a3efad9004f5e13971e0b4e16eefdd4f8c6fe1c1
+DIST wavemon-0.9.4.tar.gz 221133 BLAKE2B e07feb16dba86b1a91dc9b7d7df51da1b4498d8ea1a6ca36f6ae1e30e0e0bb09971330a470cde3425e7ae785bbd2819460ac2f1ddc2bc8da3aae29de3356bdbb SHA512 5121c6216d6697cc20ef55b2e365098e327a4966758af27a5a58cc13fe84d6e0828336031d9dcfe141210821f72fc3eaefc41fa3ab8a2e572a3b92c168c1ceb1
diff --git a/net-wireless/wavemon/files/wavemon-0.9.3-build.patch b/net-wireless/wavemon/files/wavemon-0.9.3-build.patch
deleted file mode 100644
index 74b0927..0000000
--- a/net-wireless/wavemon/files/wavemon-0.9.3-build.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- a/configure.ac	2020-12-26 17:44:01.616731241 +0100
-+++ b/configure.ac	2020-12-26 17:45:02.447292151 +0100
-@@ -8,8 +8,6 @@
- AC_CONFIG_AUX_DIR([config])
- AC_CONFIG_FILES([Makefile])
-
--CFLAGS="-O2 -Wall"
--
- # wavemon is only supported on Linux, warn user about futile compilations
- AC_CANONICAL_HOST
- case "$host_os" in
-@@ -22,6 +22,8 @@
- AC_PROG_CPP
- AC_PROG_INSTALL
- 
-+PKG_PROG_PKG_CONFIG()
-+
- # Checks for header files.
- AC_HEADER_STDC
- AC_HEADER_TIME
-@@ -29,6 +31,7 @@
- 		  net/if_arp.h netinet/ether.h net/ethernet.h pthread.h],
- 		 [], [AC_MSG_ERROR($ac_header not found)])
- AC_CHECK_HEADERS([ncursesw/curses.h])
-+PKG_CHECK_MODULES(ncurses,ncurses,LIBS="$LIBS $ncurses_LIBS",)
- 
- # linux/if.h needs 'struct sockaddr'
- # linux/wireless.h in turn depends on linux/if.h
---- a/Makefile.in	2017-07-14 21:35:18.154423280 +0300
-+++ b/Makefile.in	2017-07-14 21:35:34.613402738 +0300
-@@ -9,7 +9,7 @@
- install-suid-root: exec_perms = 4755
- 
- CC	 ?= @CC@
--CFLAGS	 ?= @CFLAGS@ @LIBNL3_CFLAGS@
-+CFLAGS	 = @CFLAGS@ @LIBNL3_CFLAGS@
- CPPFLAGS ?= @CPPFLAGS@
- LDFLAGS  ?= @LDFLAGS@
- DEFS	 ?= @DEFS@
-@@ -25,8 +25,7 @@
- DOCS	= README.md NEWS THANKS AUTHORS COPYING ChangeLog
- 
- %.o: %.c $(HEADERS)
--	@echo ' CC  ' $<
--	@$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(DEFS) -c -o $@ $<
-+	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(DEFS) -c -o $@ $<
- 
- all: @PACKAGE_NAME@
- @PACKAGE_NAME@: $(MAIN) $(OBJS)
diff --git a/net-wireless/wavemon/files/wavemon-0.9.4-build.patch b/net-wireless/wavemon/files/wavemon-0.9.4-build.patch
new file mode 100644
index 0000000..afce0a7
--- /dev/null
+++ b/net-wireless/wavemon/files/wavemon-0.9.4-build.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.in	2021-09-21 10:27:24.966739165 +0200
++++ b/Makefile.in	2021-09-21 10:27:57.537003815 +0200
+@@ -9,7 +9,7 @@
+ install-suid-root: exec_perms = 4755
+ 
+ CC	 ?= @CC@
+-CFLAGS	 ?= @CFLAGS@ @LIBNL3_CLI_CFLAGS@
++CFLAGS	 = @CFLAGS@ @LIBNL3_CLI_CFLAGS@
+ CPPFLAGS ?= @CPPFLAGS@
+ LDFLAGS  ?= @LDFLAGS@
+ DEFS	 ?= @DEFS@
diff --git a/net-wireless/wavemon/wavemon-0.9.3.ebuild b/net-wireless/wavemon/wavemon-0.9.4.ebuild
similarity index 81%
rename from net-wireless/wavemon/wavemon-0.9.3.ebuild
rename to net-wireless/wavemon/wavemon-0.9.4.ebuild
index 30c2880..34f9f37 100644
--- a/net-wireless/wavemon/wavemon-0.9.3.ebuild
+++ b/net-wireless/wavemon/wavemon-0.9.4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit autotools linux-info toolchain-funcs
+inherit autotools linux-info
 
 DESCRIPTION="Ncurses based monitor for IEEE 802.11 wireless LAN cards"
 HOMEPAGE="https://github.com/uoaerg/wavemon/"
@@ -11,22 +11,24 @@ SRC_URI="https://github.com/uoaerg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ppc sparc x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
 
 IUSE="caps"
-RDEPEND="dev-libs/libnl:3
+RDEPEND="
+	dev-libs/libnl:3[utils]
 	sys-libs/ncurses:0=
 	caps? ( sys-libs/libcap )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-DOCS=( README.md THANKS )
+DOCS=( README.md )
+
 PATCHES=(
 	"${FILESDIR}/${P}-build.patch"
 )
 
 pkg_pretend() {
-	local CONFIG_CHECK="~CFG80211_WEXT"
+	local CONFIG_CHECK="~CFG80211"
 
 	check_extra_config
 }
@@ -39,9 +41,6 @@ src_prepare() {
 	# automagic on libcap, discovered in bug #448406
 	use caps || export ac_cv_lib_cap_cap_get_flag=false
 
-	# Respect CC
-	tc-export CC
-
 	default_src_prepare
 	eautoreconf
 }