diff --git a/infrastructure/mk/bsd.port.mk b/infrastructure/mk/bsd.port.mk
index 6e2d0888fad..be0cb4360d8 100644
--- a/infrastructure/mk/bsd.port.mk
+++ b/infrastructure/mk/bsd.port.mk
@@ -1,6 +1,6 @@
 #-*- mode: Makefile; tab-width: 4; -*-
 # ex:ts=4 sw=4 filetype=make:
-#	$OpenBSD: bsd.port.mk,v 1.775 2006/10/02 17:26:34 espie Exp $
+#	$OpenBSD: bsd.port.mk,v 1.776 2006/10/09 18:11:38 espie Exp $
 #	$FreeBSD: bsd.port.mk,v 1.264 1996/12/25 02:27:44 imp Exp $
 #	$NetBSD: bsd.port.mk,v 1.62 1998/04/09 12:47:02 hubertf Exp $
 #
@@ -80,7 +80,7 @@ BULK_TARGETS?=
 FORCE_UPDATE?=No
 PKGNAMES=${FULLPKGNAME}
 # All variables relevant to the port's description
-ALL_VARIABLES?=PKGNAME HOMEPAGE DISTNAME COMMENT LIB_DEPENDS \
+ALL_VARIABLES?=HOMEPAGE DISTNAME LIB_DEPENDS \
 BUILD_DEPENDS RUN_DEPENDS REGRESS_DEPENDS USE_GMAKE MODULES FLAVORS \
 NO_BUILD NO_REGRESS PKG_ARCH SHARED_ONLY ONLY_FOR_ARCHS IS_INTERACTIVE \
 BROKEN MULTI_PACKAGES PSEUDO_FLAVORS CATEGORIES \
@@ -93,6 +93,7 @@ MASTER_SITES0 MASTER_SITES1 MASTER_SITES2 MASTER_SITES3 MASTER_SITES4 \
 MASTER_SITES5 MASTER_SITES6 MASTER_SITES7 MASTER_SITES8 MASTER_SITES9 \
 MAINTAINER SUBPACKAGE PACKAGING DESCR SUPDISTFILES \
 AUTOCONF_VERSION AUTOMAKE_VERSION CONFIGURE_ARGS
+ALL_VARIABLES2?=COMMENT FULLPKGNAME PKGNAME
 
 # special purpose user settings
 PATCH_CHECK_ONLY?=No
@@ -2751,6 +2752,11 @@ subdump-vars:
 	@echo ${FULLPKGPATH}.${_s}=${${_s}:Q}
 . endif
 .endfor
+.for _s in ${ALL_VARIABLES2}
+. if defined(${_s}${SUBPACKAGE})
+	@echo ${FULLPKGPATH}.${_s}=${${_s}${SUBPACKAGE}:Q}
+. endif
+.endfor
 
 .PHONY: \
 	_build-dir-depends _fetch-makefile _fetch-onefile \