diff --git a/sys-cluster/SOS/SOS-1.5.0.ebuild b/sys-cluster/SOS/SOS-1.5.0-r1.ebuild
similarity index 97%
rename from sys-cluster/SOS/SOS-1.5.0.ebuild
rename to sys-cluster/SOS/SOS-1.5.0-r1.ebuild
index efe8effda0..3ac0bd9858 100644
--- a/sys-cluster/SOS/SOS-1.5.0.ebuild
+++ b/sys-cluster/SOS/SOS-1.5.0-r1.ebuild
@@ -79,6 +79,11 @@ src_prepare() {
 }
 
 src_configure() {
+	if use pmi-mpi; then
+		export CC=mpicc
+		export CXX=mpicxx
+	fi
+
 	local ofimr
 	use ofi_mr_basic && ofimr="basic"
 	use ofi_mr_scalable && ofimr="scalable"