diff --git a/vfs/ChangeLog b/vfs/ChangeLog
index 3f64a78f5..d793f96d5 100644
--- a/vfs/ChangeLog
+++ b/vfs/ChangeLog
@@ -1,3 +1,8 @@
+Wed Sep 23 15:09:55 1998  Tom Tromey  <tromey@cygnus.com>
+
+	* vfs.h (MIN, MAX): Only define if not already defined; glib.h
+	also defines them.
+
 Wed Sep 23 13:33:14 1998  Pavel Machek <pavel@ucw.cz>
 
 	* ftpfs.c: Fixed segfault caused by unitialized varialble 
diff --git a/vfs/vfs.h b/vfs/vfs.h
index e3be71351..fc3f15d41 100644
--- a/vfs/vfs.h
+++ b/vfs/vfs.h
@@ -371,7 +371,11 @@ extern void mc_vfs_done( void );
  * cases (ftp transfer).				-- pavel@ucw.cz
  */
 
+#ifndef MIN
 #define MIN(a,b) ((a)<(b) ? (a) : (b))
+#endif
+#ifndef MAX
 #define MAX(a,b) ((a)<(b) ? (b) : (a))
+#endif
 
 #endif /* __VFS_H */