diff --git a/cdi.settings.in b/cdi.settings.in
index 770df0d6e3a5bd1e378c13062612d3f4adee8c02..cc0877f76db4045f574fa240ae60e0934b08cff0 100644
--- a/cdi.settings.in
+++ b/cdi.settings.in
@@ -30,6 +30,12 @@
         "lib"      : "@THREADS_LIBS@",
         "include"  : "@THREADS_INCLUDE@"
       },
+      "mpi"        : {
+        "libs"     : "@MPI_C_LIB@",
+        "cflags"   : "@MPI_C_INCLUDE@",
+        "fclibs"   : "@MPI_FC_LIB@",
+        "fcflags"  : "@MPI_FC_INCLUDE@"
+      },
       "zlib"     : {
         "lib"      : "@ZLIB_LIBS@",
         "include"  : "@ZLIB_INCLUDE@"
@@ -62,6 +68,8 @@
     "service"        : "@ENABLE_SERVICE@",
     "extra"          : "@ENABLE_EXTRA@",
     "ieg"            : "@ENABLE_IEG@",
+    "enable_mpi"    : @ENABLE_MPI@,
+    "parallel_nc4"  : @HAVE_PARALLEL_NC4@,
     "enable_python" : @ENABLE_PYTHON@,
     "enable_ruby"   : @ENABLE_RUBY@
   }
diff --git a/configure b/configure
index b05baf01a1310ba25ad82567cdba49b90b8becf0..e678deafa0f5027c40fe51543a67e524c7829765 100755
--- a/configure
+++ b/configure
@@ -650,6 +650,7 @@ FC_MOD_FLAG
 ENABLE_F2003_ISOC
 CREATE_ISOC_FALSE
 CREATE_ISOC_TRUE
+ENABLE_MPI
 USE_MPI
 USE_PPM_CORE_FALSE
 USE_PPM_CORE_TRUE
@@ -28218,6 +28219,8 @@ else
 fi
 
 
+ENABLE_MPI=`test x"$enable_mpi" = xyes && echo true || echo false`
+
 #  ----------------------------------------------------------------------
 #  Create the Fortran Interface via iso_c_binding module (Fortran 2003 Standard)
 # Check whether --enable-iso-c-interface was given.
diff --git a/configure.ac b/configure.ac
index 6af142f456b74429948a0401970049adf5710ee5..01fe53fad8a1b92d67e07d2dc03f8332f62fbf50 100644
--- a/configure.ac
+++ b/configure.ac
@@ -236,6 +236,7 @@ AC_SUBST([HAVE_PARALLEL_NC4])
 AM_CONDITIONAL([USE_MPI],[test x"$USE_MPI" = xyes])
 AM_CONDITIONAL([USE_PPM_CORE],[test $enable_ppm = yes])
 AC_SUBST([USE_MPI])
+AC_SUBST([ENABLE_MPI],[`test x"$enable_mpi" = xyes && echo true || echo false`])
 #  ----------------------------------------------------------------------
 #  Create the Fortran Interface via iso_c_binding module (Fortran 2003 Standard)
 AC_ARG_ENABLE([iso-c-interface],