diff --git a/include/mpi.h b/include/mpi.h
index 5a6cd08f7c..f6d4ae4f53 100644
--- a/include/mpi.h
+++ b/include/mpi.h
@@ -296,7 +296,7 @@ enum {
  */
 #define MPI_GROUP_NULL (&ompi_mpi_group_null)
 #define MPI_COMM_NULL (&ompi_mpi_comm_null)
-#define MPI_REQUEST_NULL ((MPI_Request) 0)
+#define MPI_REQUEST_NULL (&ompi_mpi_request_null)
 #define MPI_OP_NULL (&ompi_mpi_op_null)
 #define MPI_ERRHANDLER_NULL (&ompi_mpi_errhandler_null)
 #define MPI_INFO_NULL (&ompi_mpi_info_null)
@@ -391,6 +391,8 @@ extern struct ompi_communicator_t ompi_mpi_comm_null;
 extern struct ompi_group_t ompi_mpi_group_empty;
 extern struct ompi_group_t ompi_mpi_group_null;
 
+extern struct ompi_request_t ompi_mpi_request_null;
+
 extern struct ompi_op_t ompi_mpi_op_null;
 extern struct ompi_op_t ompi_mpi_op_max, ompi_mpi_op_min;
 extern struct ompi_op_t ompi_mpi_op_sum, ompi_mpi_op_prod;
diff --git a/include/mpif.h.in b/include/mpif.h.in
index 63b78101a9..03e6cdc6ac 100644
--- a/include/mpif.h.in
+++ b/include/mpif.h.in
@@ -281,8 +281,8 @@
        parameter (MPI_COMM_WORLD=0)
        parameter (MPI_COMM_SELF=1)
        parameter (MPI_GROUP_EMPTY=1)
-       parameter (MPI_ERRORS_ARE_FATAL=0)
-       parameter (MPI_ERRORS_RETURN=1)
+       parameter (MPI_ERRORS_ARE_FATAL=1)
+       parameter (MPI_ERRORS_RETURN=2)
 
        integer MPI_INTEGER, MPI_INTEGER1, MPI_INTEGER2, MPI_INTEGER4
        integer MPI_INTEGER8, MPI_REAL, MPI_REAL2, MPI_REAL4, MPI_REAL8