diff --git a/distrib/sets/mkvars.mk b/distrib/sets/mkvars.mk
index 3acc5fb5f561..6ec058c4f18f 100644
--- a/distrib/sets/mkvars.mk
+++ b/distrib/sets/mkvars.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mkvars.mk,v 1.7 2012/11/05 00:57:39 alnsn Exp $
+# $NetBSD: mkvars.mk,v 1.8 2013/01/28 13:46:47 nakayama Exp $
 
 MKEXTRAVARS= \
 	MACHINE \
@@ -6,7 +6,7 @@ MKEXTRAVARS= \
 	MACHINE_CPU \
 	HAVE_GCC \
 	HAVE_GDB \
-	HAS_SSP \
+	HAVE_SSP \
 	OBJECT_FMT \
 	TOOLCHAIN_MISSING \
 	EXTSRCS \
diff --git a/distrib/sets/sets.subr b/distrib/sets/sets.subr
index 8779d21420e1..7da31befc735 100644
--- a/distrib/sets/sets.subr
+++ b/distrib/sets/sets.subr
@@ -1,4 +1,4 @@
-#	$NetBSD: sets.subr,v 1.142 2013/01/16 21:11:05 christos Exp $
+#	$NetBSD: sets.subr,v 1.143 2013/01/28 13:46:47 nakayama Exp $
 #
 
 #
@@ -19,7 +19,7 @@
 #	HAVE_BINUTILS
 #	HAVE_GCC
 #	HAVE_GDB
-#	HAS_SSP
+#	HAVE_SSP
 #	TOOLCHAIN_MISSING
 #	OBJECT_FMT
 # as well as:
@@ -179,7 +179,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g"
 # In each file, a record consists of a path and a System Package name,
 # separated by whitespace. E.g.,
 #
-# 	# $NetBSD: sets.subr,v 1.142 2013/01/16 21:11:05 christos Exp $
+# 	# $NetBSD: sets.subr,v 1.143 2013/01/28 13:46:47 nakayama Exp $
 # 	.			base-sys-root	[keyword[,...]]
 # 	./altroot		base-sys-root
 # 	./bin			base-sys-root
@@ -248,7 +248,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g"
 #	skey			${MKSKEY} != no
 #	sljit			${MKSLJIT} != no
 #	solaris			${MKDTRACE} != no or ${MKZFS} != no
-#	ssp			${HAS_SSP} != no
+#	ssp			${HAVE_SSP} != no
 #	tpm			${MKTPM} != no
 #	x11			${MKX11} != no && ${X11FLAVOUR} != "Xorg"
 #	xorg			${MKX11} != no && ${X11FLAVOUR} == "Xorg"
@@ -287,7 +287,7 @@ list_set_files()
 				nv = needvars[vi]
 				kw = tolower(nv)
 				sub(/^mk/, "", kw)
-				sub(/^has_/, "", kw)
+				sub(/^have_/, "", kw)
 				if (ENVIRON[nv] != "no")
 					wanted[kw] = 1 
 			}