diff --git a/sys-cluster/sionlibl/metadata.xml b/sys-cluster/sionlibl/metadata.xml
index 32002cf2dc..0f8c4f1a83 100644
--- a/sys-cluster/sionlibl/metadata.xml
+++ b/sys-cluster/sionlibl/metadata.xml
@@ -18,17 +18,22 @@ Both, the estimated chunk size and file system block size are used to align indi
 
 SIONlib provides two different interfaces: one for parallel access (with implementations for different parallel programming technologies such as MPI, OpenMP and hybrid MPI+OpenMP) and one for sequential access which is also used internally by the SIONlib utilities.
 	</longdescription>
+	<upstream>
+		<bugs-to>https://gitlab.jsc.fz-juelich.de/cstao-public/SIONlib/SIONlib/-/issues</bugs-to>
+	</upstream>
 	<use>
 		<!--<flag name="cuda">enable CUDA aware interface</flag>-->
 		<flag name="cxx">Enable C++ support</flag>
 		<flag name="debug">enable SIONlib debug</flag>
+		<flag name="deep-est-sdv">deep-est-sdv collector selection plug-in for MSA-aware collective I/O</flag>
 		<flag name="fortran">Enable Fortran support</flag>
+		<flag name="hostname-regex">hostname-regex collector selection plug-in for MSA-aware collective I/O</flag>
 		<flag name="mpi">enable mpi</flag>
 		<flag name="python">enable python support</flag>
 		<flag name="ompi">enable hybrid openmp mpi</flag>
 		<flag name="openmp">enable openmp</flag>
 		<flag name="parutils">Enable compilation of parutils (used for benchmarking)</flag>
 		<flag name="pthreads">configure SIONlib to use pthreads for locking</flag>
-		<!--<flag name="sionfwd">enable I/O forwarding with SIONfwd</flag>-->
+		<flag name="sionfwd">enable I/O forwarding with <pkg>sys-cluster/SIONfwd</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-cluster/sionlibl/sionlibl-1.7.7.ebuild b/sys-cluster/sionlibl/sionlibl-1.7.7-r1.ebuild
similarity index 88%
rename from sys-cluster/sionlibl/sionlibl-1.7.7.ebuild
rename to sys-cluster/sionlibl/sionlibl-1.7.7-r1.ebuild
index 1e2156aa55..c31355c5aa 100644
--- a/sys-cluster/sionlibl/sionlibl-1.7.7.ebuild
+++ b/sys-cluster/sionlibl/sionlibl-1.7.7-r1.ebuild
@@ -18,12 +18,7 @@ S="${WORKDIR}/sionlib"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="+cxx debug doc examples +fortran +mpi +ompi +openmp +parutils +pthreads python"
-#TODO: cuda sionfwd msa
-#--enable-sionfwd=/path/to/sionfwd
-#--msa=(hostname-regex|deep-est-sdv)]	MSA aware collective operations for the given system
-
-PATCHES=( "${FILESDIR}/${PN}-respect-flags.patch" )
+IUSE="+cxx debug deep-est-sdv doc examples +fortran hostname-regex +mpi +ompi +openmp +parutils +pthreads python sionfwd" #cuda
 
 RDEPEND="
 	mpi? ( virtual/mpi )
@@ -32,12 +27,16 @@ RDEPEND="
 		virtual/mpi
 	)
 	openmp? ( || ( sys-devel/gcc:*[openmp] sys-libs/libomp ) )
+	sionfwd? ( sys-cluster/SIONfwd )
 "
 DEPEND="
 	${RDEPEND}
 	${PYTHON_DEPS}
 "
 
+REQUIRED_USE="?? ( hostname-regex deep-est-sdv )"
+PATCHES=( "${FILESDIR}/${PN}-respect-flags.patch" )
+
 pkg_setup() {
 	FORTRAN_NEED_OPENMP=0
 	use openmp && FORTRAN_NEED_OPENMP=1
@@ -64,8 +63,13 @@ src_configure() {
 
 	append-fflags -fallow-argument-mismatch
 
+	local msa="none"
+	use deep-est-sdv && msa="deep-est-sdv"
+	use hostname-regex && msa="hostname-regex"
+
 	local myconf=(
 		--disable-mic
+		--msa="${msa}"
 		--prefix="${T}/prefix/usr"
 	)
 
@@ -80,6 +84,7 @@ src_configure() {
 
 	use debug && myconf+=( "--enable-debug" )
 	use python && myconf+=( "--enable-python=3" )
+	use sionfwd && myconf+=( "--enable-sionfwd=${EPREFIX}/usr" )
 
 	./configure "${myconf[@]}" || die
 }