diff --git a/gfx2.cfg b/gfx2.cfg
index 3daafec3..706cc05c 100644
Binary files a/gfx2.cfg and b/gfx2.cfg differ
diff --git a/mountlist.c b/mountlist.c
index c936ed3f..90aa2ec3 100644
--- a/mountlist.c
+++ b/mountlist.c
@@ -159,6 +159,7 @@
 #undef opendir
 #undef closedir
 
+#if !defined(__HAIKU__) && !defined(__BEOS__)
 #ifndef ME_DUMMY
 # define ME_DUMMY(Fs_name, Fs_type)		\
     (strcmp (Fs_type, "autofs") == 0            \
@@ -179,6 +180,7 @@
      || strcmp (Fs_type, "nfs") == 0            \
      || strcmp (Fs_type, "volfs") == 0)
 #endif
+#endif
 
 #ifndef ME_REMOTE
 /* A file system is `remote' if its Fs_name contains a `:'