diff --git a/scripts/crosstool-NG.sh.in b/scripts/crosstool-NG.sh.in
index 01807150..c14fe0c8 100644
--- a/scripts/crosstool-NG.sh.in
+++ b/scripts/crosstool-NG.sh.in
@@ -412,6 +412,7 @@ if [ -z "${CT_RESTART}" ]; then
 
     CT_DoLog EXTRA "Installing user-supplied crosstool-NG configuration"
     CT_DoExecLog DEBUG install -m 0755 "${CT_LIB_DIR}/scripts/toolchain-config.in" "${CT_PREFIX_DIR}/bin/${CT_TARGET}-ct-ng.config"
+    CT_DoExecLog DEBUG sed -r -i -e 's,@@grep@@,"'"${grep}"'",;' "${CT_PREFIX_DIR}/bin/${CT_TARGET}-ct-ng.config"
     bzip2 -c -9 .config >>"${CT_PREFIX_DIR}/bin/${CT_TARGET}-ct-ng.config"
 
     CT_DoStep EXTRA "Dumping internal crosstool-NG configuration"
diff --git a/scripts/toolchain-config.in b/scripts/toolchain-config.in
index d8a4df32..f28e07db 100644
--- a/scripts/toolchain-config.in
+++ b/scripts/toolchain-config.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 SKIP_ME="### CT_NG SKIP ME ###"
-skip_me=$(($(cat "${0}" |grep --binary-files=text -o -b -E "^${SKIP_ME}$" |cut -d : -f 1)+${#SKIP_ME}+1))
+skip_me=$(($(cat "${0}" |@@grep@@ --binary-files=text -o -b -E "^${SKIP_ME}$" |cut -d : -f 1)+${#SKIP_ME}+1))
 dd if="${0}" bs=${skip_me} skip=1 2>/dev/null |bzcat
 exit 0