diff --git a/sys-cluster/extrae/extrae-4.0.1.ebuild b/sys-cluster/extrae/extrae-4.0.1.ebuild
index 8bcd5ef13d..4e08d5e857 100644
--- a/sys-cluster/extrae/extrae-4.0.1.ebuild
+++ b/sys-cluster/extrae/extrae-4.0.1.ebuild
@@ -31,11 +31,12 @@ peruse +posix-clock pthread sampling +single-mpi-lib sionlib smpss spectral +xml
 #	aspectj? ( >=dev-java/aspectj-1.9.6 )
 CDEPEND="
 	${PYTHON_DEPS}
+	dev-libs/libpfm:=
 	dev-libs/libxml2
 	dev-libs/papi
 	!sys-cluster/openmpi[libompitrace(+)]
-	sys-libs/binutils-libs
-	sys-libs/libunwind
+	sys-libs/binutils-libs:=
+	sys-libs/libunwind:=
 	sys-libs/zlib
 	virtual/mpi
 
@@ -80,6 +81,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-3.8.3-link-sionlib.patch"
+	"${FILESDIR}/${P}-fix-pfm-linking.patch"
 )
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
diff --git a/sys-cluster/extrae/files/extrae-4.0.1-fix-pfm-linking.patch b/sys-cluster/extrae/files/extrae-4.0.1-fix-pfm-linking.patch
new file mode 100644
index 0000000000..f2a3673e77
--- /dev/null
+++ b/sys-cluster/extrae/files/extrae-4.0.1-fix-pfm-linking.patch
@@ -0,0 +1,12 @@
+diff -ru /var/tmp/portage/sys-cluster/extrae-4.0.1/work/extrae-4.0.1/src/cmd-line/Makefile.am extrae-4.0.1/src/cmd-line/Makefile.am
+--- /var/tmp/portage/sys-cluster/extrae-4.0.1/work/extrae-4.0.1/src/cmd-line/Makefile.am	2022-05-13 17:41:45.000000000 +0200
++++ extrae-4.0.1/src/cmd-line/Makefile.am	2022-06-05 08:45:43.807262310 +0200
+@@ -11,7 +11,7 @@
+ extrae_cmd_CFLAGS = -I$(INCLUDE_DIR) -I$(COMMON_INC) -I$(TRACER_INC) \
+  -I$(TRACER_INC)/wrappers/API -I$(TRACER_INC)/clocks -I$(TRACER_INC)/hwc -O -g
+ 
+-extrae_cmd_LDADD = $(TRACER_LIB)/libseqtrace.la $(MERGER_LIB)/libmpi2prv.la -lm
++extrae_cmd_LDADD = $(TRACER_LIB)/libseqtrace.la $(MERGER_LIB)/libmpi2prv.la -lm @PAPI_LIBS@
+ if HAVE_BINUTILS
+ extrae_cmd_LDADD += $(BFD_LDFLAGS) $(BFD_RPATH) $(BFD_LIBS) $(LIBERTY_LDFLAGS) $(LIBERTY_RPATH) $(LIBERTY_LIBS)
+ endif