diff --git a/CHANGELOG b/CHANGELOG
index 0950191..532d529 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -37,6 +37,9 @@ version 2.60
 	    itself as 100% CPU use. Thanks to Chris Moore for finding
 	    this.
 
+	    Fix shell-scripting bug in bld/pkg-wrapper. Thanks to 
+	    Mark Mitchell for the patch.
+
 	    
 version 2.59
             Fix regression in 2.58 which caused failure to start up
diff --git a/bld/pkg-wrapper b/bld/pkg-wrapper
index c32034e..a29871e 100755
--- a/bld/pkg-wrapper
+++ b/bld/pkg-wrapper
@@ -3,8 +3,8 @@
 search=$1
 shift
 
-if grep "^\#[[:space:]]*define[[:space:]]*$search" config.h 2>&1 >/dev/null || \
-   grep $search 2>&1 >/dev/null ; then
+if grep "^\#[[:space:]]*define[[:space:]]*$search" config.h >/dev/null 2>&1 || \
+   grep $search >/dev/null 2>&1; then
   exec $*
 fi