diff --git a/mpi-serial/mpif.F90 b/mpi-serial/mpif.F90
index e1268ffbaa70..369b71459dcb 100644
--- a/mpi-serial/mpif.F90
+++ b/mpi-serial/mpif.F90
@@ -4,13 +4,8 @@
 
 Module mpi
 implicit none
-! MPI_ADDRESS_KIND: typekind 4 should be 4 byte integer,
-!                   and typekind 8 be 8-byte integer, etc.
-#ifdef SIZEOF_LONG
-        INTEGER, PARAMETER, PUBLIC :: MPI_ADDRESS_KIND=SIZEOF_LONG
-#else
-        INTEGER, PARAMETER, PUBLIC :: MPI_ADDRESS_KIND=8
-#endif
+! MPI_ADDRESS_KIND: need an 8-byte integer.
+        INTEGER, PARAMETER, PUBLIC :: MPI_ADDRESS_KIND=selected_int_kind(13)
 
 
         include "mpif.h"