diff -up mpich/configure.ac.onenode mpich/configure.ac
--- mpich/configure.ac.onenode	2017-09-01 08:54:37.000000000 +0200
+++ mpich/configure.ac	2017-10-30 15:23:40.886476457 +0100
@@ -948,19 +948,11 @@ mkdir -p modules private_modules test_mo
 # into "postdeps_FC" and causes linking errors later on.
 postdeps_FC=$(echo $postdeps_FC | sed 's/-l //g')
 
-if test x"${with_mpi}" = x"yes"; then
   if test x"${enable_openmp}" = x"yes"; then
         SUFFIX="_openmp"
   else
         SUFFIX=""
   fi
-else
-  if test x"${enable_openmp}" = x"yes"; then
-        SUFFIX="_onenode_openmp"
-  else
-        SUFFIX="_onenode"
-  fi
-fi
 
 AC_SUBST([SUFFIX])
 AC_SUBST([PKG_CONFIG_FILE],[elpa${SUFFIX}-${PACKAGE_VERSION}.pc])
diff -up mpich/INSTALL.md.onenode mpich/INSTALL.md
--- mpich/INSTALL.md.onenode	2017-09-01 08:54:37.000000000 +0200
+++ mpich/INSTALL.md	2017-10-30 15:23:40.886476457 +0100
@@ -151,9 +151,6 @@ configure FC=gfortran --with-mpi=0
 
 DO NOT specify a MPI compiler here!
 
-Note, that the the installed *ELPA* library files will be suffixed with
-"_onenode", in order to descriminate this build from possible ones with MPI.
-
 
 Please continue reading at "C) Enabling GPU support"