diff --git a/vfs/ChangeLog b/vfs/ChangeLog
index 1ca232739..2b2c106c0 100644
--- a/vfs/ChangeLog
+++ b/vfs/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-27  Roland Illig  <roland.illig@gmx.de>
+
+	* ftpfs.c (ftpfs_initconn): Replace int with socklen_t where
+	appropriate. (ftpfs_open_data_connection): Likewise.
+
 2004-10-27  Leonard den Ottolander  <leonard * den ottolander nl>
 
 	* tar.c tar_read_header(): q should not point to a static string.
diff --git a/vfs/ftpfs.c b/vfs/ftpfs.c
index a1c68239f..310e0389b 100644
--- a/vfs/ftpfs.c
+++ b/vfs/ftpfs.c
@@ -879,7 +879,7 @@ ftpfs_initconn (struct vfs_class *me, struct vfs_s_super *super)
 {
     struct sockaddr_in data_addr;
     int data;
-    int len = sizeof(data_addr);
+    socklen_t len = sizeof(data_addr);
     struct protoent *pe;
 
     pe = getprotobyname ("tcp");
@@ -929,7 +929,8 @@ ftpfs_open_data_connection (struct vfs_class *me, struct vfs_s_super *super, con
 		      const char *remote, int isbinary, int reget)
 {
     struct sockaddr_in from;
-    int s, j, data, fromlen = sizeof(from);
+    int s, j, data;
+    socklen_t fromlen = sizeof(from);
     
     if ((s = ftpfs_initconn (me, super)) == -1)
         return -1;