diff --git a/configs/16z/tools/dopatch.sh b/configs/16z/tools/dopatch.sh
index 5eaa8b881d..1193ff7927 100755
--- a/configs/16z/tools/dopatch.sh
+++ b/configs/16z/tools/dopatch.sh
@@ -34,11 +34,12 @@
 #
 ############################################################################
 
-USAGE="${0} \$PWD"
+USAGE="${0} [-R] \$PWD"
 WD=`pwd`
 TOOLDIR=${WD}/configs/16z/tools
 ME=${TOOLDIR}/dopatch.sh
 PATCH=${TOOLDIR}/zneo-zdsii-5_0_1-variadic-func-fix.patch
+ARGS=${1}
 
 if [ ! -x ${ME} ]; then
   echo "ERROR:  This script must be executed from the top-level NuttX directory"
@@ -55,5 +56,5 @@ fi
 cd .. || \
   { echo "ERROR: failed to CD to the parent directory"; exit 1; }
 
-cat ${PATCH} | patch -p1 || \
+cat ${PATCH} | patch ${ARGS} -p1 || \
   { echo "ERROR: patch failed" ; exit 1; }
diff --git a/configs/16z/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch b/configs/16z/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch
index b1464f340b..b22efeb86d 100644
--- a/configs/16z/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch
+++ b/configs/16z/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch
@@ -1,5 +1,5 @@
 diff --git a/apps/nshlib/nsh_console.c b/apps/nshlib/nsh_console.c
-index ba7dbe7..b9f9991 100644
+index ba7dbe7..45e4ab1 100644
 --- a/apps/nshlib/nsh_console.c
 +++ b/apps/nshlib/nsh_console.c
 @@ -46,6 +46,7 @@
@@ -113,7 +113,7 @@ index ba7dbe7..b9f9991 100644
 +  return ret;
 +}
 diff --git a/apps/nshlib/nsh_console.h b/apps/nshlib/nsh_console.h
-index c78362f..59bd8d7 100644
+index c78362f..207f9b9 100644
 --- a/apps/nshlib/nsh_console.h
 +++ b/apps/nshlib/nsh_console.h
 @@ -47,6 +47,7 @@
diff --git a/configs/z16f2800100zcog/tools/dopatch.sh b/configs/z16f2800100zcog/tools/dopatch.sh
index 9f738184a8..f0f86a53e7 100755
--- a/configs/z16f2800100zcog/tools/dopatch.sh
+++ b/configs/z16f2800100zcog/tools/dopatch.sh
@@ -34,11 +34,12 @@
 #
 ############################################################################
 
-USAGE="${0} \$PWD"
+USAGE="${0} [-R] \$PWD"
 WD=`pwd`
 TOOLDIR=${WD}/configs/z16f2800100zcog/tools
 ME=${TOOLDIR}/dopatch.sh
 PATCH=${TOOLDIR}/zneo-zdsii-5_0_1-variadic-func-fix.patch
+ARGS=${1}
 
 if [ ! -x ${ME} ]; then
   echo "ERROR:  This script must be executed from the top-level NuttX directory"
@@ -55,5 +56,5 @@ fi
 cd .. || \
   { echo "ERROR: failed to CD to the parent directory"; exit 1; }
 
-cat ${PATCH} | patch -p1 || \
+cat ${PATCH} | patch ${ARGS} -p1 || \
   { echo "ERROR: patch failed" ; exit 1; }
diff --git a/configs/z16f2800100zcog/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch b/configs/z16f2800100zcog/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch
index b1464f340b..b22efeb86d 100644
--- a/configs/z16f2800100zcog/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch
+++ b/configs/z16f2800100zcog/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch
@@ -1,5 +1,5 @@
 diff --git a/apps/nshlib/nsh_console.c b/apps/nshlib/nsh_console.c
-index ba7dbe7..b9f9991 100644
+index ba7dbe7..45e4ab1 100644
 --- a/apps/nshlib/nsh_console.c
 +++ b/apps/nshlib/nsh_console.c
 @@ -46,6 +46,7 @@
@@ -113,7 +113,7 @@ index ba7dbe7..b9f9991 100644
 +  return ret;
 +}
 diff --git a/apps/nshlib/nsh_console.h b/apps/nshlib/nsh_console.h
-index c78362f..59bd8d7 100644
+index c78362f..207f9b9 100644
 --- a/apps/nshlib/nsh_console.h
 +++ b/apps/nshlib/nsh_console.h
 @@ -47,6 +47,7 @@