diff --git a/utils/llvmdo b/utils/llvmdo
index 8d21eda427b..2924c55ebd8 100755
--- a/utils/llvmdo
+++ b/utils/llvmdo
@@ -43,7 +43,7 @@ if test ! -x "$PROGRAM" ; then
   exit 1
 fi
 shift;
-TOPDIR=`pwd | sed -e 's#\(.*/llvm\).*#\1#'`
+TOPDIR=`pwd | sed -e 's#\(.*/llvm[0-9]*\).*#\1#'`
 if test -d "$TOPDIR" ; then
   cd $TOPDIR
   case `uname -s` in
diff --git a/utils/llvmgrep b/utils/llvmgrep
index a1f77636c4f..e5a08ad0051 100755
--- a/utils/llvmgrep
+++ b/utils/llvmgrep
@@ -18,7 +18,8 @@
 # details.
 ##===----------------------------------------------------------------------===##
 
-TOPDIR=`pwd | sed -e 's#\(.*/llvm\).*#\1#'`
+TOPDIR=`pwd | sed -e 's#\(.*/llvm[0-9]*\).*#\1#'`
+echo $TOPDIR
 if test -d "$TOPDIR" ; then
   cd $TOPDIR
   case `uname -s` in