diff --git a/vfs/ChangeLog b/vfs/ChangeLog
index 284c5f157..0368cecd2 100644
--- a/vfs/ChangeLog
+++ b/vfs/ChangeLog
@@ -1,3 +1,10 @@
+2004-11-15  Leonard den Ottolander  <leonard * den ottolander nl>
+
+	* vfs.c: Changed types for mc_chmod, mc_chown, mc_mknod to mode_t,
+	uid_t, gid_t, and dev_t where appropriate.
+
+	Patch extended by Roland Illig.
+
 2004-11-15  Leonard den Ottolander  <leonard * den ottolander nl>
 
 	* vfs.c: fix MC_NAMEOP macro calls to use the canonicalized path.
diff --git a/vfs/vfs.c b/vfs/vfs.c
index 03c48ae3a..eb4118987 100644
--- a/vfs/vfs.c
+++ b/vfs/vfs.c
@@ -360,15 +360,15 @@ int mc_##name inarg \
     return result; \
 }
 
-MC_NAMEOP (chmod, (const char *path, int mode), (vfs, mpath, mode))
-MC_NAMEOP (chown, (const char *path, int owner, int group), (vfs, mpath, owner, group))
+MC_NAMEOP (chmod, (const char *path, mode_t mode), (vfs, mpath, mode))
+MC_NAMEOP (chown, (const char *path, uid_t owner, gid_t group), (vfs, mpath, owner, group))
 MC_NAMEOP (utime, (const char *path, struct utimbuf *times), (vfs, mpath, times))
 MC_NAMEOP (readlink, (const char *path, char *buf, int bufsiz), (vfs, mpath, buf, bufsiz))
 MC_NAMEOP (unlink, (const char *path), (vfs, mpath))
 MC_NAMEOP (symlink, (const char *name1, const char *path), (vfs, name1, mpath))
 MC_NAMEOP (mkdir, (const char *path, mode_t mode), (vfs, mpath, mode))
 MC_NAMEOP (rmdir, (const char *path), (vfs, mpath))
-MC_NAMEOP (mknod, (const char *path, int mode, int dev), (vfs, mpath, mode, dev))
+MC_NAMEOP (mknod, (const char *path, mode_t mode, dev_t dev), (vfs, mpath, mode, dev))
 
 
 #define MC_HANDLEOP(name, inarg, callarg) \
diff --git a/vfs/vfs.h b/vfs/vfs.h
index 841b46308..8aa6a7ebf 100644
--- a/vfs/vfs.h
+++ b/vfs/vfs.h
@@ -32,14 +32,14 @@ int mc_stat (const char *path, struct stat *buf);
 int mc_lstat (const char *path, struct stat *buf);
 int mc_fstat (int fd, struct stat *buf);
 
-int mc_chmod (const char *path, int mode);
-int mc_chown (const char *path, int owner, int group);
+int mc_chmod (const char *path, mode_t mode);
+int mc_chown (const char *path, uid_t owner, gid_t group);
 int mc_utime (const char *path, struct utimbuf *times);
 int mc_readlink (const char *path, char *buf, int bufsiz);
 int mc_unlink (const char *path);
 int mc_symlink (const char *name1, const char *name2);
 int mc_link (const char *name1, const char *name2);
-int mc_mknod (const char *, int, int);
+int mc_mknod (const char *, mode_t, dev_t);
 int mc_rename (const char *original, const char *target);
 int mc_rmdir (const char *path);
 int mc_mkdir (const char *path, mode_t mode);