Index: coregrind/m_debuginfo/readpdb.c
===================================================================
--- coregrind/m_debuginfo/readpdb.c	(revision 11504)
+++ coregrind/m_debuginfo/readpdb.c	(working copy)
@@ -2466,7 +2466,7 @@ HChar* ML_(find_name_of_pdb_file)( HChar
    */
    HChar* sh      = "/bin/sh";
    HChar* strings = "/usr/bin/strings";
-   HChar* egrep   = "/usr/bin/egrep";
+   HChar* egrep   = "`[ -f /bin/egrep ] && echo /bin/egrep || echo /usr/bin/egrep`";
 
    /* (sh) -c "(strings) (pename) | (egrep) 'pdb' > (tmpname) */
    Int cmdlen = VG_(strlen)(strings) + VG_(strlen)(pename)
@@ -2474,7 +2474,7 @@ HChar* ML_(find_name_of_pdb_file)( HChar
                 + 100/*misc*/;
    HChar* cmd = ML_(dinfo_zalloc)("di.readpe.fnopf.cmd", cmdlen);
    vg_assert(cmd);
-   VG_(sprintf)(cmd, "%s -c \"%s %s | %s '\\.pdb|\\.PDB' >> %s\"",
+   VG_(sprintf)(cmd, "%s -c \"%s '%s' | %s '\\.pdb|\\.PDB' >> %s\"",
                      sh, strings, pename, egrep, tmpname);
    vg_assert(cmd[cmdlen-1] == 0);
    if (0) VG_(printf)("QQQQQQQQ: %s\n", cmd);