--- src/copyin.c
+++ src/copyin.c
@@ -108,7 +108,7 @@
    header type.  */
 
 static void
-tape_skip_padding (int in_file_des, int offset)
+tape_skip_padding (int in_file_des, off_t offset)
 {
   int pad;
 
--- src/extern.h
+++ src/extern.h
@@ -166,8 +166,8 @@
 void copy_files_tape_to_disk (int in_des, int out_des, off_t num_bytes);
 void copy_files_disk_to_tape (int in_des, int out_des, off_t num_bytes, char *filename);
 void copy_files_disk_to_disk (int in_des, int out_des, off_t num_bytes, char *filename);
-void warn_if_file_changed (char *file_name, unsigned long old_file_size,
-                           off_t old_file_mtime);
+void warn_if_file_changed (char *file_name, off_t old_file_size,
+                           unsigned long old_file_mtime);
 void create_all_directories (char *name);
 void prepare_append (int out_file_des);
 char *find_inode_file (unsigned long node_num,
--- src/util.c
+++ src/util.c
@@ -441,8 +441,8 @@
 void
 copy_files_tape_to_disk (int in_des, int out_des, off_t num_bytes)
 {
-  long size;
-  long k;
+  off_t size;
+  off_t k;
 
   while (num_bytes > 0)
     {
@@ -472,8 +472,8 @@
 copy_files_disk_to_tape (int in_des, int out_des, off_t num_bytes,
 			 char *filename)
 {
-  long size;
-  long k;
+  off_t size;
+  off_t k;
   int rc;
   off_t original_num_bytes;
 
@@ -525,8 +525,8 @@
 copy_files_disk_to_disk (int in_des, int out_des, off_t num_bytes,
 			 char *filename)
 {
-  long size;
-  long k;
+  off_t size;
+  off_t k;
   off_t original_num_bytes;
   int rc;
 
@@ -567,8 +567,8 @@
 /* Warn if file changed while it was being copied.  */
 
 void
-warn_if_file_changed (char *file_name, unsigned long old_file_size,
-		      off_t old_file_mtime)
+warn_if_file_changed (char *file_name, off_t old_file_size,
+		      unsigned long old_file_mtime)
 {
   struct stat new_file_stat;
   if ((*xstat) (file_name, &new_file_stat) < 0)