diff --git a/sys-cluster/otf2/metadata.xml b/sys-cluster/otf2/metadata.xml
index 0c04defaed..2edcd3ced1 100644
--- a/sys-cluster/otf2/metadata.xml
+++ b/sys-cluster/otf2/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Alessandro Barbieri</name>
 	</maintainer>
 	<use>
-		<flag name="sionlib">Enable <pkg>sys-cluster/sionlib</pkg> support</flag>
+		<flag name="sionlib">Enable <pkg>sys-cluster/sionlibl</pkg> support</flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-cluster/otf2/otf2-2.3.ebuild b/sys-cluster/otf2/otf2-2.3-r1.ebuild
similarity index 76%
rename from sys-cluster/otf2/otf2-2.3.ebuild
rename to sys-cluster/otf2/otf2-2.3-r1.ebuild
index 078fda8688..35a693294e 100644
--- a/sys-cluster/otf2/otf2-2.3.ebuild
+++ b/sys-cluster/otf2/otf2-2.3-r1.ebuild
@@ -20,7 +20,7 @@ RDEPEND="
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep 'dev-python/six[${PYTHON_USEDEP}]')
 
-	sionlib? ( sys-cluster/sionlib[tools] )
+	sionlib? ( sys-cluster/sionlibl:= )
 "
 DEPEND="${RDEPEND}"
 
@@ -36,9 +36,15 @@ src_configure() {
 
 		$(use_enable test backend-test-runs)
 		$(use_enable debug)
-		$(use_with sionlib)
 	)
 
+        if use sionlib; then
+                myconf+=( "--with-sionlib=${EPREFIX}/usr" )
+                myconf+=( "--with-sionlib-headers=${EPREFIX}/usr/include/sionlibl" )
+	else
+                myconf+=( "--without-sionlib" )
+        fi
+
 	econf "${myconf[@]}"
 }