diff -up mpich/configure.ac.r mpich/configure.ac
--- mpich/configure.ac.r	2014-06-26 12:57:49.488978955 +0200
+++ mpich/configure.ac	2014-06-26 12:57:49.489978947 +0200
@@ -374,6 +374,7 @@ mkdir modules
 AC_CONFIG_FILES([
   Makefile
   elpa.pc:elpa.pc.in
+  elpa_mt.pc:elpa_mt.pc.in
 ])
 AC_OUTPUT
 grep "^#define" config.h > config-f90.h
diff -up mpich/elpa_mt.pc.in.r mpich/elpa_mt.pc.in
--- mpich/elpa_mt.pc.in.r	2014-06-26 12:57:49.489978947 +0200
+++ mpich/elpa_mt.pc.in	2014-06-26 12:57:49.489978947 +0200
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: @PACKAGE_NAME@
+Description: ELPA is a Fortran-based high-performance computational library for the (massively) parallel solution of symmetric or Hermitian, standard or generalized eigenvalue problems.
+Version: @PACKAGE_VERSION@
+URL: @PACKAGE_URL@
+Libs: -L${libdir} -lelpa_mt
+fcflags= -I${libdir}/gfortran/modules
diff -up mpich/elpa.pc.in.r mpich/elpa.pc.in
--- mpich/elpa.pc.in.r	2013-10-28 15:48:06.000000001 +0100
+++ mpich/elpa.pc.in	2014-06-26 12:57:49.489978947 +0200
@@ -7,6 +7,5 @@ Name: @PACKAGE_NAME@
 Description: ELPA is a Fortran-based high-performance computational library for the (massively) parallel solution of symmetric or Hermitian, standard or generalized eigenvalue problems.
 Version: @PACKAGE_VERSION@
 URL: @PACKAGE_URL@
-Libs: -L${libdir} -lelpa-@ELPA_LIB_VERSION@
-Cflags: -I${includedir}/elpa-@ELPA_LIB_VERSION@
-fcflags= -I${includedir}/elpa-@ELPA_LIB_VERSION@/modules
+Libs: -L${libdir} -lelpa
+fcflags= -I${libdir}/gfortran/modules
diff -up mpich/Makefile.am.r mpich/Makefile.am
--- mpich/Makefile.am.r	2014-02-27 14:47:20.000000001 +0100
+++ mpich/Makefile.am	2014-06-26 13:05:18.698163114 +0200
@@ -19,8 +19,14 @@ endif
 
 if WITH_OPENMP
 libelpa_mt_la_SOURCES = src/elpa1.F90 src/elpa2.F90
+libelpa_mt_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=FC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(FC) $(AM_FCLAGS) \
+	$(FCFLAGS) $(libelpa_la_LDFLAGS) $(LDFLAGS) -o $@
 else
 libelpa_la_SOURCES = src/elpa1.F90 src/elpa2.F90
+libelpa_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=FC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(FC) $(AM_FCLAGS) \
+	$(FCFLAGS) $(libelpa_la_LDFLAGS) $(LDFLAGS) -o $@
 endif
 
 if WITH_GENERIC_SIMPLE
@@ -164,7 +170,11 @@ files_DATA = \
 
 # pkg-config stuff
 pkgconfigdir = $(libdir)/pkgconfig
+if WITH_OPENMP
+pkgconfig_DATA = elpa_mt.pc
+else
 pkgconfig_DATA = elpa.pc
+endif
 
 # test programs
 if WITH_OPENMP
@@ -193,19 +203,19 @@ check_SCRIPTS = test_real.sh test_real2.
 TESTS = $(check_SCRIPTS)
 
 test_real.sh:
-	echo "mpiexec -n 2 ./test_real > /dev/null 2>&1" > test_real.sh
+	echo "mpiexec -n `getconf _NPROCESSORS_ONLN` ./test_real > /dev/null 2>&1" > test_real.sh
 	chmod +x test_real.sh	
 
 test_real2.sh:
-	echo "mpiexec -n 2 ./test_real2 > /dev/null 2>&1" > test_real2.sh
+	echo "mpiexec -n `getconf _NPROCESSORS_ONLN` ./test_real2 > /dev/null 2>&1" > test_real2.sh
 	chmod +x test_real2.sh	
 
 test_complex.sh:
-	echo "mpiexec -n 2 ./test_complex > /dev/null 2>&1" > test_complex.sh
+	echo "mpiexec -n `getconf _NPROCESSORS_ONLN` ./test_complex > /dev/null 2>&1" > test_complex.sh
 	chmod +x test_complex.sh	
 
 test_complex2.sh:
-	echo "mpiexec -n 2 ./test_complex2 > /dev/null 2>&1" > test_complex2.sh
+	echo "mpiexec -n `getconf _NPROCESSORS_ONLN` ./test_complex2 > /dev/null 2>&1" > test_complex2.sh
 	chmod +x test_complex2.sh