diff --git a/sftp-client.c b/sftp-client.c
index 8593cb8ce..512a8ad4b 100644
--- a/sftp-client.c
+++ b/sftp-client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-client.c,v 1.82 2008/04/18 12:32:11 djm Exp $ */
+/* $OpenBSD: sftp-client.c,v 1.83 2008/06/07 21:52:46 djm Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
  *
@@ -282,7 +282,7 @@ get_decode_statvfs(int fd, struct statvfs *st, u_int expected_id, int quiet)
 	st->f_files = buffer_get_int64(&msg);
 	st->f_ffree = buffer_get_int64(&msg);
 	st->f_favail = buffer_get_int64(&msg);
-	st->f_fsid = buffer_get_int(&msg);
+	st->f_fsid = buffer_get_int64(&msg);
 	flag = buffer_get_int(&msg);
 	st->f_namemax = buffer_get_int(&msg);
 
@@ -333,10 +333,10 @@ do_init(int fd_in, int fd_out, u_int transfer_buflen, u_int num_requests)
 		    strcmp(value, "1") == 0)
 			exts |= SFTP_EXT_POSIX_RENAME;
 		if (strcmp(name, "statvfs@openssh.com") == 0 &&
-		    strcmp(value, "1") == 0)
+		    strcmp(value, "2") == 0)
 			exts |= SFTP_EXT_STATVFS;
 		if (strcmp(name, "fstatvfs@openssh.com") == 0 &&
-		    strcmp(value, "1") == 0)
+		    strcmp(value, "2") == 0)
 			exts |= SFTP_EXT_FSTATVFS;
 		xfree(name);
 		xfree(value);
diff --git a/sftp-server.c b/sftp-server.c
index a9cc9408a..2c25df9de 100644
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-server.c,v 1.80 2008/05/18 21:29:05 djm Exp $ */
+/* $OpenBSD: sftp-server.c,v 1.81 2008/06/07 21:52:46 djm Exp $ */
 /*
  * Copyright (c) 2000-2004 Markus Friedl.  All rights reserved.
  *
@@ -502,7 +502,7 @@ send_statvfs(u_int32_t id, struct statvfs *st)
 	buffer_put_int64(&msg, st->f_files);
 	buffer_put_int64(&msg, st->f_ffree);
 	buffer_put_int64(&msg, st->f_favail);
-	buffer_put_int(&msg, st->f_fsid);
+	buffer_put_int64(&msg, st->f_fsid);
 	buffer_put_int(&msg, flag);
 	buffer_put_int(&msg, st->f_namemax);
 	send_msg(&msg);
@@ -528,10 +528,10 @@ process_init(void)
 #ifdef USEE_STATVFS
 	/* statvfs extension */
 	buffer_put_cstring(&msg, "statvfs@openssh.com");
-	buffer_put_cstring(&msg, "1"); /* version */
+	buffer_put_cstring(&msg, "2"); /* version */
 	/* fstatvfs extension */
 	buffer_put_cstring(&msg, "fstatvfs@openssh.com");
-	buffer_put_cstring(&msg, "1"); /* version */
+	buffer_put_cstring(&msg, "2"); /* version */
 #endif
 	send_msg(&msg);
 	buffer_free(&msg);