diff --git a/pkgtools/pkglint/files/makevars.map b/pkgtools/pkglint/files/makevars.map
index 6c80c66ce172..797efdf3c760 100644
--- a/pkgtools/pkglint/files/makevars.map
+++ b/pkgtools/pkglint/files/makevars.map
@@ -1,4 +1,4 @@
-# $NetBSD: makevars.map,v 1.128 2006/07/11 12:01:06 rillig Exp $
+# $NetBSD: makevars.map,v 1.129 2006/07/12 19:33:58 rillig Exp $
 #
 
 # This file contains the guessed type of some variables, according to
@@ -381,7 +381,7 @@ MACHINE_ARCH		Identifier [$system]
 MACHINE_GNU_PLATFORM	PlatformTriple [$system]
 MAINTAINER		Mail_Address [m:s,c:ds]
 MAKE			ShellCommand [$system]
-MAKEFILE		Pathname [m:s,c:s]
+MAKEFILE		Pathname [$package]
 MAKEFLAGS		List of ShellWord [$package_list]
 MAKEVARS		List of Varname [builtin.mk:a,b:a,h:a]
 MAKE_DIRS		List of Pathname [$package_list]
@@ -610,6 +610,8 @@ TOOLS_PATH.*		Pathname [$system]
 TOOLS_PLATFORM.*	ShellCommand [$system]
 TOUCH_FLAGS		List of ShellWord [$system]
 UNLIMIT_RESOURCES	List of { datasize stacksize memorysize } [m:as,c:a]
+UNPRIVILEGED_USER	UserGroupName [$user]
+UNPRIVILEGED_GROUP	UserGroupName [$user]
 UNWRAP_FILES		List of Pathmask [$package_list]
 USE_BUILTIN.*		YesNo_Indirectly [builtin.mk:s]
 USE_CROSSBASE		Yes [m:s]