diff -up mpich/configure.ac.onenode mpich/configure.ac
--- mpich/configure.ac.onenode	2020-09-15 12:55:04.903053847 +0200
+++ mpich/configure.ac	2020-09-15 13:18:02.433294919 +0200
@@ -1696,19 +1696,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
 
 dnl store-build-config
 AC_ARG_ENABLE([store-build-config],
diff -up mpich/INSTALL.md.onenode mpich/INSTALL.md
--- mpich/INSTALL.md.onenode	2020-09-15 12:55:04.903053847 +0200
+++ mpich/INSTALL.md	2020-09-15 12:55:35.322278705 +0200
@@ -171,9 +171,6 @@ configure FC=gfortran --with-mpi=no
 
 **DO NOT specify a MPI compiler here!**
 
-Note, that the installed *ELPA* library files will be suffixed with
-`_onenode`, in order to discriminate this build from possible ones with MPI.
-
 
 Please continue reading at "C) Enabling GPU support"