diff --git a/sys-cluster/extrae/extrae-3.8.3-r7.ebuild b/sys-cluster/extrae/extrae-3.8.3-r8.ebuild
similarity index 96%
rename from sys-cluster/extrae/extrae-3.8.3-r7.ebuild
rename to sys-cluster/extrae/extrae-3.8.3-r8.ebuild
index 50f2ccc32d..49144b4b85 100644
--- a/sys-cluster/extrae/extrae-3.8.3-r7.ebuild
+++ b/sys-cluster/extrae/extrae-3.8.3-r8.ebuild
@@ -47,7 +47,7 @@ CDEPEND="
 	memkind? ( dev-libs/memkind )
 	online? ( sys-cluster/synapse )
 	opencl? ( dev-util/opencl-headers )
-	sionlib? ( sys-cluster/sionlib:=[-tools] )
+	sionlib? ( sys-cluster/sionlib:= )
 	spectral? (
 		sci-libs/fftw
 		sys-cluster/spectral
@@ -178,6 +178,10 @@ src_configure() {
 	else
 		myconf+=( "--without-opencl" )
 	fi
+	if use sionlib; then
+		myconf+=( "--with-sionlib=${EPREFIX}/usr" )
+		myconf+=( "--with-sionlib-headers=${EPREFIX}/usr/include/sionlib" )
+	fi
 	if use spectral; then
 		myconf+=( "--with-fft=${EPREFIX}/usr" )
 		myconf+=( "--with-spectral=${EPREFIX}/usr" )
@@ -186,8 +190,6 @@ src_configure() {
 		myconf+=( "--without-spectral" )
 	fi
 
-	use sionlib && myconf+=( "--with-sionlib=${EPREFIX}/usr" )
-
 	econf "${myconf[@]}"
 }