diff --git a/utils/llvmdo b/utils/llvmdo
index eb696184711..4e7465dbdaa 100755
--- a/utils/llvmdo
+++ b/utils/llvmdo
@@ -47,7 +47,11 @@ ARGS="$*"
 TOPDIR=`pwd | sed -e 's#\(.*/llvm\).*#\1#'`
 if test -d "$TOPDIR" ; then
   cd $TOPDIR
-  find $LLVMDO_DIRS -type f \
+  case `uname -s` in
+    SunOS) find_prog=gfind ;;
+    *) find_prog=find ;;
+  esac
+  $find_prog $LLVMDO_DIRS -type f \
     \( \
       -path 'docs/doxygen/*' -o \
       -path 'docs/CommandGuide/html/*' -o \
diff --git a/utils/llvmgrep b/utils/llvmgrep
index ec2bd4f5be9..a1f77636c4f 100755
--- a/utils/llvmgrep
+++ b/utils/llvmgrep
@@ -21,7 +21,12 @@
 TOPDIR=`pwd | sed -e 's#\(.*/llvm\).*#\1#'`
 if test -d "$TOPDIR" ; then
   cd $TOPDIR
-  ./utils/llvmdo -dirs "include lib tools utils docs examples test projects" egrep -H -n "$*"
+  case `uname -s` in
+    SunOS) grep_cmd="ggrep -H -n" ;;
+    Linux) grep_cmd="egrep -H -n" ;;
+    *) grep_cmd="egrep -l -n" ;;
+  esac
+  ./utils/llvmdo -dirs "include lib tools utils docs examples test projects" $grep_cmd "$*"
 else
   echo "Can't find LLVM top directory in $TOPDIR"
 fi