diff --git a/pkg_summary-utils/Makefile b/pkg_summary-utils/Makefile
index c0ffb4ce02..be7bbda94d 100644
--- a/pkg_summary-utils/Makefile
+++ b/pkg_summary-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2008/10/22 20:17:40 cheusov Exp $
+# $NetBSD: Makefile,v 1.20 2008/10/22 22:16:19 cheusov Exp $
 
 DISTNAME=	pkg_summary-utils-${VERSION}
 CATEGORIES=	pkgtools
@@ -38,6 +38,7 @@ NO_CHECKSUM=	yes
 MAKE_ENV+=	MAKEOBJDIR=${WRKDIR}
 MAKE_ENV+=	MKCATPAGES=no
 MAKE_ENV+=	AWKMODDIR=${PREFIX}/share/runawk
+MAKE_ENV+=	SH=${SH:Q}
 
 AUTO_MKDIRS=	yes
 
diff --git a/pkg_summary-utils/files/Makefile b/pkg_summary-utils/files/Makefile
index 508c74e86d..50dec6592f 100644
--- a/pkg_summary-utils/files/Makefile
+++ b/pkg_summary-utils/files/Makefile
@@ -8,6 +8,9 @@ AWKMODDIR?=	${PREFIX}/share/awk
 
 INST_DIR?=	${INSTALL} -d
 
+SH?=		/bin/sh
+AWK?=		/usr/bin/awk
+
 ############################################################
 
 .include "Makefile.version"
@@ -47,6 +50,8 @@ PROJECTNAME=	pkg_summary-utils
 	    -e 's,@@datadir@@,${DATADIR},g' \
 	    -e 's,@@version@@,${VERSION},g' \
 	    -e 's,@@awkmoddir@@,${AWKMODDIR},g' \
+	    -e 's,@SH@,${SH},g' \
+	    -e 's,@AWK@,${AWK},g' \
 	    ${.ALLSRC} > ${.TARGET} && chmod +x ${.TARGET}
 
 .PHONY: clean-my
@@ -75,7 +80,7 @@ install-dirs:
 test : all
 	@echo 'running tests...'; \
 	if cd ${.CURDIR}/tests && \
-		env OBJDIR=${.OBJDIR} ./test.sh \
+		env PATH="${.OBJDIR}:$$PATH" OBJDIR=${.OBJDIR} ./test.sh \
 			> ${.OBJDIR}/_test.res && \
 		diff -u ${.CURDIR}/tests/test.out ${.OBJDIR}/_test.res; \
 	then echo '   succeeded'; \
diff --git a/pkg_summary-utils/files/cvs_checksum.in b/pkg_summary-utils/files/cvs_checksum.in
index 5cb8b8e86b..9a34f116a6 100755
--- a/pkg_summary-utils/files/cvs_checksum.in
+++ b/pkg_summary-utils/files/cvs_checksum.in
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@SH@
 
 # Copyright (c) 2007-2008 Aleksey Cheusov <vle@gmx.net>
 #
diff --git a/pkg_summary-utils/files/pkg_grep_summary.in b/pkg_summary-utils/files/pkg_grep_summary.in
index 66e0d5e380..97402f9210 100755
--- a/pkg_summary-utils/files/pkg_grep_summary.in
+++ b/pkg_summary-utils/files/pkg_grep_summary.in
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@SH@
 
 # Copyright (c) 2007-2008 Aleksey Cheusov <vle@gmx.net>
 #
diff --git a/pkg_summary-utils/files/pkg_list_all_pkgs.in b/pkg_summary-utils/files/pkg_list_all_pkgs.in
index 812d2e4fdb..19356d6a2a 100755
--- a/pkg_summary-utils/files/pkg_list_all_pkgs.in
+++ b/pkg_summary-utils/files/pkg_list_all_pkgs.in
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@SH@
 
 # Copyright (c) 2007-2008 Aleksey Cheusov <vle@gmx.net>
 #
diff --git a/pkg_summary-utils/files/pkg_micro_src_summary.in b/pkg_summary-utils/files/pkg_micro_src_summary.in
index 822b49422a..596e8b1dfc 100755
--- a/pkg_summary-utils/files/pkg_micro_src_summary.in
+++ b/pkg_summary-utils/files/pkg_micro_src_summary.in
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@SH@
 
 # Copyright (c) 2007-2008 Aleksey Cheusov <vle@gmx.net>
 #
diff --git a/pkg_summary-utils/files/pkg_refresh_summary.in b/pkg_summary-utils/files/pkg_refresh_summary.in
index 0dea67e3a4..677f0458af 100755
--- a/pkg_summary-utils/files/pkg_refresh_summary.in
+++ b/pkg_summary-utils/files/pkg_refresh_summary.in
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@SH@
 
 # Copyright (c) 2007-2008 Aleksey Cheusov <vle@gmx.net>
 #
diff --git a/pkg_summary-utils/files/pkg_src_summary.in b/pkg_summary-utils/files/pkg_src_summary.in
index 4025b9a6a5..fe907499d9 100755
--- a/pkg_summary-utils/files/pkg_src_summary.in
+++ b/pkg_summary-utils/files/pkg_src_summary.in
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@SH@
 
 # Copyright (c) 2007-2008 Aleksey Cheusov <vle@gmx.net>
 #
diff --git a/pkg_summary-utils/files/pkg_update_src_summary.in b/pkg_summary-utils/files/pkg_update_src_summary.in
index b742710757..fabf1d57b0 100755
--- a/pkg_summary-utils/files/pkg_update_src_summary.in
+++ b/pkg_summary-utils/files/pkg_update_src_summary.in
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@SH@
 
 # Copyright (c) 2007-2008 Aleksey Cheusov <vle@gmx.net>
 #
diff --git a/pkg_summary-utils/files/pkg_update_summary.in b/pkg_summary-utils/files/pkg_update_summary.in
index e30f2b139a..46e35f7a39 100755
--- a/pkg_summary-utils/files/pkg_update_summary.in
+++ b/pkg_summary-utils/files/pkg_update_summary.in
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@SH@
 
 # Copyright (c) 2007-2008 Aleksey Cheusov <vle@gmx.net>
 #
diff --git a/pkg_summary-utils/files/tests/test.sh b/pkg_summary-utils/files/tests/test.sh
index a7c226038b..802173cc24 100755
--- a/pkg_summary-utils/files/tests/test.sh
+++ b/pkg_summary-utils/files/tests/test.sh
@@ -1,11 +1,17 @@
 #!/bin/sh
 
-export LC_ALL=C
+LC_ALL=C
+export LC_ALL
 
 srcdir=..
-export objdir=${OBJDIR:=.}
+if test "$OBJDIR"; then
+    objdir=${OBJDIR}
+else
+    objdir='.'
+fi
 
-export AWKPATH="$srcdir"
+AWKPATH="$srcdir"
+export AWKPATH
 
 print_args (){
 #    echo "$@"