diff --git a/dist.sh b/dist.sh
index ab381b87c..f56c3ff09 100644
--- a/dist.sh
+++ b/dist.sh
@@ -72,7 +72,7 @@ if [[ $AUTOBUILD -eq 0 ]]; then
 	read;
 fi
 
-VERSION=`egrep "#define RENDERDOC_VERSION_(MAJOR|MINOR)" renderdoc/data/version.h | tr -dc '[0-9\n]' | tr '\n' '.' | egrep -o '[0-9]+\.[0-9]+'`
+VERSION=`grep -E "#define RENDERDOC_VERSION_(MAJOR|MINOR)" renderdoc/data/version.h | tr -dc '[0-9\n]' | tr '\n' '.' | grep -Eo '[0-9]+\.[0-9]+'`
 
 export RENDERDOC_VERSION="${VERSION}.0"
 
diff --git a/renderdoc/driver/gl/gl_common.cpp b/renderdoc/driver/gl/gl_common.cpp
index 39e82bfa1..44adf3f58 100644
--- a/renderdoc/driver/gl/gl_common.cpp
+++ b/renderdoc/driver/gl/gl_common.cpp
@@ -1871,12 +1871,12 @@ string ToStrHelper<false, RDCGLenum>::Get(const RDCGLenum &el)
 {
 #undef GLenum
 
-  // egrep -ih '#define[ \t]*[A-Z_0-9]*[ \t]*0x[0-9A-F]{4,}\s*$' glcorearb.h  glext.h  wglext.h
-  // glxext.h
-  //			| awk '{print $2" "$3}' | grep -v '_BIT[_ ]' | sed -e '{s# 0x0*# #g}' | awk -F"[. ]"
-  //'!a[$2]++'
-  //			| sed -e '{s%\(.*\) \(.*\)%\t\tTOSTR_CASE_STRINGIZE_GLENUM(\1)%g}' | grep -v _BIT | awk '
-  //! x[$0]++'
+  // in official/
+  // grep -Eih '#define[ \t]*[A-Z_0-9]*[ \t]*0x[0-9A-F]{4,}\s*$' *.h
+  //  | awk '{print $2" "$3}' | grep -v '_BIT[_ ]'
+  //  | sed -e '{s# 0x0*# #g}' | awk -F"[. ]" '!a[$2]++'
+  //  | sed -e '{s%\(.*\) \(.*\)%\t\tTOSTR_CASE_STRINGIZE_GLENUM(\1)%g}'
+  //  | grep -v _BIT | awk '!x[$0]++'
 
   RDCCOMPILE_ASSERT(sizeof(RDCGLenum) == sizeof(uint32_t),
                     "Enum isn't 32bits - serialising is a problem!");
diff --git a/renderdoc/driver/gl/gl_enum.h b/renderdoc/driver/gl/gl_enum.h
index 8911975a6..25eb02182 100644
--- a/renderdoc/driver/gl/gl_enum.h
+++ b/renderdoc/driver/gl/gl_enum.h
@@ -25,9 +25,9 @@
 
 #pragma once
 
-// egrep -ih '#define[ \t]*[A-Z_0-9]*[ \t]*0x[0-9A-F]{4,}\s*$' glcorearb.h  glext.h  wglext.h
-// glxext.h
-//			| awk '{print $2" "$3}' | sed -e '{s%\(.*\) \(.*\)%\te\1 = \2,%g}' | awk ' !x[$0]++'
+// in official/
+// grep -Eih '#define[ \t]*[A-Z_0-9]*[ \t]*0x[0-9A-F]{4,}\s*$' *.h
+//    | awk '{print $2" "$3}' | sed -e '{s%\(.*\) \(.*\)%\te\1 = \2,%g}' | awk ' !x[$0]++'
 
 enum RDCGLenum
 {
diff --git a/renderdoc/driver/gl/hookset.pl b/renderdoc/driver/gl/hookset.pl
index fc6bdf20a..cdbe59a43 100644
--- a/renderdoc/driver/gl/hookset.pl
+++ b/renderdoc/driver/gl/hookset.pl
@@ -95,7 +95,7 @@ my @dllexportfuncs = ();
 my @glextfuncs = ();
 my @processed = ();
 
-my $typedefs = `egrep -h PFN[0-9A-Z_-]+PROC official/glcorearb.h official/glext.h`;
+my $typedefs = `grep -Eh PFN[0-9A-Z_-]+PROC official/glcorearb.h official/glext.h`;
 foreach my $typedef (split(/\n/, $typedefs))
 {
 	if($typedef =~ /^typedef (.*)\([A-Z *]* (.*)\) \((.*)\);/)