diff --git a/include/mpi.h b/include/mpi.h
index 5a6cd08f7c..feae0e67eb 100644
--- a/include/mpi.h
+++ b/include/mpi.h
@@ -241,9 +241,9 @@ enum {
 #define MPI_ERR_UNSUPPORTED_DATAREP   51
 #define MPI_ERR_UNSUPPORTED_OPERATION 52
 #define MPI_ERR_WIN                   53
+#define MPI_ERR_LASTCODE              54
 
 #define MPI_ERR_SYSRESOURCE          -2
-#define MPI_ERR_LASTCODE              -1
 
 
 /*
diff --git a/include/mpif.h.in b/include/mpif.h.in
index 03e6cdc6ac..00d2319268 100644
--- a/include/mpif.h.in
+++ b/include/mpif.h.in
@@ -260,17 +260,17 @@
        parameter( MPI_ERR_WIN                  = 53)
        
        parameter( MPI_ERR_SYSRESOURCE          = -2)
-       parameter( MPI_ERR_LASTCODE             = -1)
+       parameter( MPI_ERR_LASTCODE             = 54)
 
 !
 ! comparison results
 !
        integer MPI_IDENT, MPI_CONGRUENT, MPI_SIMILAR, MPI_UNEQUAL
 
-       parameter (MPI_IDENT=1)
-       parameter (MPI_CONGRUENT=2)
-       parameter (MPI_SIMILAR=3)
-       parameter (MPI_UNEQUAL=4)
+       parameter (MPI_IDENT=0)
+       parameter (MPI_CONGRUENT=1)
+       parameter (MPI_SIMILAR=2)
+       parameter (MPI_UNEQUAL=3)
 !
 ! lookup table indices
 !