diff --git a/sysdeps/common/ChangeLog b/sysdeps/common/ChangeLog
index 3326f39a..ad6c9da6 100644
--- a/sysdeps/common/ChangeLog
+++ b/sysdeps/common/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-22  Benoît Dejean  <tazforever@dlfp.org>
+
+	* mountlist.c: (read_filesystem_list): Merged FreeBSD Marcus' patch.
+
 2004-07-17  Benoît Dejean  <tazforever@dlfp.org>
 
 	* fsusage.c: (glibtop_get_fsusage_s): Started implementation of read, write.
diff --git a/sysdeps/common/mountlist.c b/sysdeps/common/mountlist.c
index 736748da..2b769843 100644
--- a/sysdeps/common/mountlist.c
+++ b/sysdeps/common/mountlist.c
@@ -95,7 +95,7 @@ static struct mount_entry *read_filesystem_list (gboolean need_fs_type);
 #endif
 
 
-#if defined (MOUNTED_GETMNTINFO) && !defined (__NetBSD__) && !defined (__OpenBSD__)
+#if defined (MOUNTED_GETMNTINFO) && !defined (__NetBSD__) && !defined (__OpenBSD__) && !defined(__FreeBSD__)
 static const char *
 fstype_to_string (short t)
 {
@@ -300,7 +300,7 @@ read_filesystem_list (gboolean need_fs_type)
 	me = (struct mount_entry *) g_malloc (sizeof (struct mount_entry));
 	me->me_devname = g_strdup (fsp->f_mntfromname);
 	me->me_mountdir = g_strdup (fsp->f_mntonname);
-#if defined(__NetBSD__) || defined(__OpenBSD__)
+#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
 	me->me_type = g_strdup (fsp->f_fstypename);
 #else
 	me->me_type = g_strdup (fstype_to_string (fsp->f_type));