diff --git a/src/ChangeLog b/src/ChangeLog
index a4eb2e8a3..a4e27447b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+Thu Oct  1 18:43:34 1998  Pavel Roskin <pavel_roskin@geocities.com>
+
+	* file.c: Commented out search for egrep because execvp() does
+	it itself
+
+	* utilunix.c: vfs_uid should not be used if VFS is disabled
+
 Tue Sep 29 17:53:56 1998  Pavel Machek  <pavel@atrey.karlin.mff.cuni.cz>
 
 	* main.c: removed stupid reference to {sfs,extfs}_which
diff --git a/src/find.c b/src/find.c
index 84ae4b1ad..0ccea26df 100644
--- a/src/find.c
+++ b/src/find.c
@@ -353,9 +353,12 @@ find_add_match (Dlg_head *h, char *dir, char *file)
 #endif	    
 }
 
-char *
+static char *
 locate_egrep (void)
 {
+/* commented out because mc runs egrep via execvp() which searches PATH
+    itself. It is likely that egrep in PATH is better than in /bin */
+#if 0
     char *paths [] = {
 	"/bin/egrep",
 	"/usr/bin/egrep",
@@ -370,6 +373,7 @@ locate_egrep (void)
 	if (stat (*p, &s) == 0)
 	    return *p;
     }
+#endif
     return "egrep";
 }
 
diff --git a/src/utilunix.c b/src/utilunix.c
index 643d2b84b..aefc1700a 100644
--- a/src/utilunix.c
+++ b/src/utilunix.c
@@ -282,8 +282,11 @@ int my_system (int flags, const char *shell, const char *command)
 #if 0
 	prepare_environment ();
 #endif
+
+#ifdef USE_VFS
 	if (flags & EXECUTE_SETUID)
 	    setreuid (vfs_uid, vfs_uid);
+#endif
 	
 	if (flags & EXECUTE_AS_SHELL)
 	    execl (shell, shell, "-c", command, (char *) 0);