diff --git a/ChangeLog b/ChangeLog
index 08f48d61c..b5f5fcc47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
  - (dtucker) [configure.ac] Set put -lselinux into $LIBS while testing for
    SELinux functions so they're detected correctly.  Patch from pebenito at
    gentoo.org.
+ - (tim) [buildpkg.sh.in] Some systems have really limited nawk (OpenServer).
+   Allow setting alternate awk in openssh-config.local.
 
 20061003
  - (tim) [configure.ac] Move CHECK_HEADERS test before platform specific
@@ -2522,4 +2524,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.4568 2006/10/06 23:07:20 dtucker Exp $
+$Id: ChangeLog,v 1.4569 2006/10/07 01:49:36 tim Exp $
diff --git a/buildpkg.sh.in b/buildpkg.sh.in
index 9e4ff4239..17349f7fc 100644
--- a/buildpkg.sh.in
+++ b/buildpkg.sh.in
@@ -24,6 +24,7 @@ PKGNAME=OpenSSH
 # revisions within the same version (REV=a)
 #REV=
 SYSVINIT_NAME=opensshd
+AWK=${AWK:="nawk"}
 MAKE=${MAKE:="make"}
 SSHDUID=67	# Default privsep uid
 SSHDGID=67	# Default privsep gid
@@ -645,7 +646,7 @@ cat >mk-proto.awk << _EOF
 _EOF
 
 find . | egrep -v "prototype|pkginfo|mk-proto.awk" | sort | \
-	pkgproto $PROTO_ARGS | nawk -f mk-proto.awk > prototype
+	pkgproto $PROTO_ARGS | ${AWK} -f mk-proto.awk > prototype
 
 # /usr/local is a symlink on some systems
 [ "${USR_LOCAL_IS_SYMLINK}" = yes ]  &&  {