diff --git a/src/mpi/f77/file_get_byte_offset_f.c b/src/mpi/f77/file_get_byte_offset_f.c
index fffc1e0d9d..748f4af9c6 100644
--- a/src/mpi/f77/file_get_byte_offset_f.c
+++ b/src/mpi/f77/file_get_byte_offset_f.c
@@ -30,7 +30,7 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_FILE_GET_BYTE_OFFSET,
                            pmpi_file_get_byte_offset_,
                            pmpi_file_get_byte_offset__,
                            pmpi_file_get_byte_offset_f,
-                           (MPI_Fint *fh, MPI_Offset *offset, MPI_Fint *disp, MPI_Fint *ierr),
+                           (MPI_Fint *fh, MPI_Offset *offset, MPI_Offset *disp, MPI_Fint *ierr),
                            (fh, offset, disp, ierr) )
 #endif
 
@@ -47,7 +47,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_GET_BYTE_OFFSET,
                            mpi_file_get_byte_offset_,
                            mpi_file_get_byte_offset__,
                            mpi_file_get_byte_offset_f,
-                           (MPI_Fint *fh, MPI_Offset *offset, MPI_Fint *disp, MPI_Fint *ierr),
+                           (MPI_Fint *fh, MPI_Offset *offset, MPI_Offset *disp, MPI_Fint *ierr),
                            (fh, offset, disp, ierr) )
 #endif
 
@@ -57,16 +57,13 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_GET_BYTE_OFFSET,
 #endif
 
 void mpi_file_get_byte_offset_f(MPI_Fint *fh, MPI_Offset *offset,
-				MPI_Fint *disp, MPI_Fint *ierr)
+				MPI_Offset *disp, MPI_Fint *ierr)
 {
     MPI_File c_fh;
-    MPI_Offset c_disp;
 
     c_fh = MPI_File_f2c(*fh);
 
     *ierr = OMPI_INT_2_FINT(MPI_File_get_byte_offset(c_fh, 
 						     (MPI_Offset) *offset,
-						     &c_disp));
-
-    *disp = (MPI_Fint) c_disp;
+						     disp));
 }
diff --git a/src/mpi/f77/prototypes_mpi.h b/src/mpi/f77/prototypes_mpi.h
index 970fc01cb8..cdb6f7bf01 100644
--- a/src/mpi/f77/prototypes_mpi.h
+++ b/src/mpi/f77/prototypes_mpi.h
@@ -145,7 +145,7 @@ void mpi_file_iread_f(MPI_Fint *fh, char *buf, MPI_Fint *count, MPI_Fint *dataty
 void mpi_file_iwrite_f(MPI_Fint *fh, char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *request, MPI_Fint *ierr);
 void mpi_file_seek_f(MPI_Fint *fh, MPI_Offset *offset, MPI_Fint *whence, MPI_Fint *ierr);
 void mpi_file_get_position_f(MPI_Fint *fh, MPI_Offset *offset, MPI_Fint *ierr);
-void mpi_file_get_byte_offset_f(MPI_Fint *fh, MPI_Offset *offset, MPI_Fint *disp, MPI_Fint *ierr);
+void mpi_file_get_byte_offset_f(MPI_Fint *fh, MPI_Offset *offset, MPI_Offset *disp, MPI_Fint *ierr);
 void mpi_file_read_shared_f(MPI_Fint *fh, char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *status, MPI_Fint *ierr);
 void mpi_file_write_shared_f(MPI_Fint *fh, char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *status, MPI_Fint *ierr);
 void mpi_file_iread_shared_f(MPI_Fint *fh, char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *request, MPI_Fint *ierr);
@@ -449,7 +449,7 @@ void mpi_file_iread(MPI_Fint *fh, char *buf, MPI_Fint *count, MPI_Fint *datatype
 void mpi_file_iwrite(MPI_Fint *fh, char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *request, MPI_Fint *ierr);
 void mpi_file_seek(MPI_Fint *fh, MPI_Offset *offset, MPI_Fint *whence, MPI_Fint *ierr);
 void mpi_file_get_position(MPI_Fint *fh, MPI_Offset *offset, MPI_Fint *ierr);
-void mpi_file_get_byte_offset(MPI_Fint *fh, MPI_Offset *offset, MPI_Fint *disp, MPI_Fint *ierr);
+void mpi_file_get_byte_offset(MPI_Fint *fh, MPI_Offset *offset, MPI_Offset *disp, MPI_Fint *ierr);
 void mpi_file_read_shared(MPI_Fint *fh, char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *status, MPI_Fint *ierr);
 void mpi_file_write_shared(MPI_Fint *fh, char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *status, MPI_Fint *ierr);
 void mpi_file_iread_shared(MPI_Fint *fh, char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *request, MPI_Fint *ierr);
@@ -750,7 +750,7 @@ void mpi_file_iread_(MPI_Fint *fh, char *buf, MPI_Fint *count, MPI_Fint *datatyp
 void mpi_file_iwrite_(MPI_Fint *fh, char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *request, MPI_Fint *ierr);
 void mpi_file_seek_(MPI_Fint *fh, MPI_Offset *offset, MPI_Fint *whence, MPI_Fint *ierr);
 void mpi_file_get_position_(MPI_Fint *fh, MPI_Offset *offset, MPI_Fint *ierr);
-void mpi_file_get_byte_offset_(MPI_Fint *fh, MPI_Offset *offset, MPI_Fint *disp, MPI_Fint *ierr);
+void mpi_file_get_byte_offset_(MPI_Fint *fh, MPI_Offset *offset, MPI_Offset *disp, MPI_Fint *ierr);
 void mpi_file_read_shared_(MPI_Fint *fh, char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *status, MPI_Fint *ierr);
 void mpi_file_write_shared_(MPI_Fint *fh, char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *status, MPI_Fint *ierr);
 void mpi_file_iread_shared_(MPI_Fint *fh, char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *request, MPI_Fint *ierr);
@@ -1051,7 +1051,7 @@ void mpi_file_iread__(MPI_Fint *fh, char *buf, MPI_Fint *count, MPI_Fint *dataty
 void mpi_file_iwrite__(MPI_Fint *fh, char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *request, MPI_Fint *ierr);
 void mpi_file_seek__(MPI_Fint *fh, MPI_Offset *offset, MPI_Fint *whence, MPI_Fint *ierr);
 void mpi_file_get_position__(MPI_Fint *fh, MPI_Offset *offset, MPI_Fint *ierr);
-void mpi_file_get_byte_offset__(MPI_Fint *fh, MPI_Offset *offset, MPI_Fint *disp, MPI_Fint *ierr);
+void mpi_file_get_byte_offset__(MPI_Fint *fh, MPI_Offset *offset, MPI_Offset *disp, MPI_Fint *ierr);
 void mpi_file_read_shared__(MPI_Fint *fh, char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *status, MPI_Fint *ierr);
 void mpi_file_write_shared__(MPI_Fint *fh, char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *status, MPI_Fint *ierr);
 void mpi_file_iread_shared__(MPI_Fint *fh, char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *request, MPI_Fint *ierr);
@@ -1352,7 +1352,7 @@ void MPI_FILE_IREAD(MPI_Fint *fh, char *buf, MPI_Fint *count, MPI_Fint *datatype
 void MPI_FILE_IWRITE(MPI_Fint *fh, char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *request, MPI_Fint *ierr);
 void MPI_FILE_SEEK(MPI_Fint *fh, MPI_Offset *offset, MPI_Fint *whence, MPI_Fint *ierr);
 void MPI_FILE_GET_POSITION(MPI_Fint *fh, MPI_Offset *offset, MPI_Fint *ierr);
-void MPI_FILE_GET_BYTE_OFFSET(MPI_Fint *fh, MPI_Offset *offset, MPI_Fint *disp, MPI_Fint *ierr);
+void MPI_FILE_GET_BYTE_OFFSET(MPI_Fint *fh, MPI_Offset *offset, MPI_Offset *disp, MPI_Fint *ierr);
 void MPI_FILE_READ_SHARED(MPI_Fint *fh, char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *status, MPI_Fint *ierr);
 void MPI_FILE_WRITE_SHARED(MPI_Fint *fh, char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *status, MPI_Fint *ierr);
 void MPI_FILE_IREAD_SHARED(MPI_Fint *fh, char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *request, MPI_Fint *ierr);