diff --git a/acconfig.h b/acconfig.h
index 1e10c156d7..a31cf2a319 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -18,6 +18,7 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
 # endif
 #endif
 #undef AFS_AFSDB_ENV
+#undef AFS_LARGEFILE_ENV
 #undef AFS_NAMEI_ENV
 #undef BITMAP_LATER
 #undef BOS_RESTRICTED_MODE
diff --git a/acinclude.m4 b/acinclude.m4
index 5916b392dd..8e1c8b496e 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -23,6 +23,8 @@ AC_ARG_ENABLE( bos-restricted-mode,
 [  --enable-bos-restricted-mode 	enable bosserver restricted mode which disables certain bosserver functionality],, enable_bos_restricted_mode="no")
 AC_ARG_ENABLE( bos-new-config,
 [  --enable-bos-new-config	 	enable bosserver pickup of BosConfig.new on restarts],, enable_bos_new_config="no")
+AC_ARG_ENABLE( largefile-fileserver,
+[  --enable-largefile-fileserver        enable large file support in fileserver],, enable_largefile_fileserver="no")
 AC_ARG_ENABLE( namei-fileserver,
 [  --enable-namei-fileserver 		force compilation of namei fileserver in preference to inode fileserver],, enable_namei_fileserver="no")
 AC_ARG_ENABLE( supergroups,
@@ -770,6 +772,10 @@ if test "$enable_bos_new_config" = "yes"; then
 	AC_DEFINE(BOS_NEW_CONFIG, 1, [define if you want to enable automatic renaming of BosConfig.new to BosConfig at startup])
 fi
 
+if test "$enable_largefile_fileserver" = "yes"; then
+	AC_DEFINE(AFS_LARGEFILE_ENV, 1, [define if you want large file fileserver])
+fi
+
 if test "$enable_namei_fileserver" = "yes"; then
 	AC_DEFINE(AFS_NAMEI_ENV, 1, [define if you want to want namei fileserver])
 fi
diff --git a/src/.cvsignore b/src/.cvsignore
new file mode 100644
index 0000000000..a08d0a3e87
--- /dev/null
+++ b/src/.cvsignore
@@ -0,0 +1 @@
+helper-splint.sh
diff --git a/src/volser/restorevol.c b/src/volser/restorevol.c
index 28949e701e..449e7d01b5 100644
--- a/src/volser/restorevol.c
+++ b/src/volser/restorevol.c
@@ -147,7 +147,7 @@ readdata(buffer, size)
 	    if (code < 0)
 		fprintf(stderr, "Code = %d; Errno = %d\n", code, errno);
 	    else
-		fprintf(stderr, "Read %d bytes out of %d\n", code, size);
+		fprintf(stderr, "Read %d bytes out of %lld\n", code, (afs_uintmax_t)size);
 	}
 	if ((code >= 0) && (code < BUFSIZE))
 	    buffer[size] = 0;	/* Add null char at end */