diff --git a/sys-cluster/extrae/extrae-3.8.3-r10.ebuild b/sys-cluster/extrae/extrae-3.8.3-r10.ebuild
index 800ba5c570..de4da9133d 100644
--- a/sys-cluster/extrae/extrae-3.8.3-r10.ebuild
+++ b/sys-cluster/extrae/extrae-3.8.3-r10.ebuild
@@ -78,8 +78,10 @@ BDEPEND="
 		dev-tex/latexmk
 		dev-texlive/texlive-latexextra
 	)
+	java? ( app-admin/chrpath )
 "
 
+PATCHES=( "${FILESDIR}/${P}-link-sionlib.patch" )
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 
@@ -226,6 +228,11 @@ src_install() {
 	docompress -x "/usr/share/doc/${PF}/examples"
 	docompress -x "/usr/share/doc/${PF}/tests"
 
+	if use java; then
+		chrpath -d "${ED}/usr/$(get_libdir)/libextrae-jvmti-agent.so" || die
+		chrpath -d "${ED}/usr/$(get_libdir)/libjavatrace.so" || die
+	fi
+
 	find "${ED}" -name '*.a' -delete || die
 	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/sys-cluster/extrae/files/extrae-3.8.3-link-sionlib.patch b/sys-cluster/extrae/files/extrae-3.8.3-link-sionlib.patch
new file mode 100644
index 0000000000..209da88d13
--- /dev/null
+++ b/sys-cluster/extrae/files/extrae-3.8.3-link-sionlib.patch
@@ -0,0 +1,23 @@
+--- a/src/tracer/Makefile.am
++++ b/src/tracer/Makefile.am
+@@ -631,6 +631,10 @@
+ NEW_MPI_LIBS = -L@MPI_LIBSDIR@ @MPI_LIBS@ -static
+ endif
+ 
++if HAVE_SIONLIB
++SIONLIB_LINKER_FLAGS = @SIONLIB_LIBS@
++endif
++
+ COMMON_LINKER_FLAGS = \
+  -release $(PACKAGE_VERSION) \
+  $(HWC_LINKER_FLAGS) \
+@@ -639,7 +643,8 @@
+  $(XML2_LINKER_FLAGS) \
+  $(LDL)\
+  $(LIBZ_LINKER_FLAGS) \
+- $(MRNET_LINKER_FLAGS)
++ $(MRNET_LINKER_FLAGS) \
++ $(SIONLIB_LINKER_FLAGS)
+ 
+ libcudaompitrace_la_LDFLAGS = $(COMMON_LINKER_FLAGS)
+ libcudaompitracef_la_LDFLAGS = $(COMMON_LINKER_FLAGS)