diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index dea85e21948e..c30fdf7cfef8 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.356 2003/09/01 09:38:42 uwe Exp $
+#	$NetBSD: bsd.own.mk,v 1.357 2003/09/12 07:44:10 lukem Exp $
 
 .if !defined(_BSD_OWN_MK_)
 _BSD_OWN_MK_=1
@@ -666,4 +666,18 @@ USE_${var}?= yes
 USE_XF86_4?=	yes
 .endif
 
+#
+# Where X11R6 sources are and where it is installed to
+#
+X11SRCDIR?=		/usr/xsrc
+X11SRCDIR.xc?=		${X11SRCDIR}/xfree/xc
+X11SRCDIR.local?=	${X11SRCDIR}/local
+X11ROOTDIR?=		/usr/X11R6
+X11BINDIR?=		${X11ROOTDIR}/bin
+X11FONTDIR?=		${X11ROOTDIR}/lib/X11/fonts
+X11INCDIR?=		${X11ROOTDIR}/include
+X11LIBDIR?=		${X11ROOTDIR}/lib/X11
+X11MANDIR?=		${X11ROOTDIR}/man
+X11USRLIBDIR?=		${X11ROOTDIR}/lib
+
 .endif	# !defined(_BSD_OWN_MK_)
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index c772163d611d..1a2d63939921 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.prog.mk,v 1.183 2003/08/22 19:17:00 dsl Exp $
+#	$NetBSD: bsd.prog.mk,v 1.184 2003/09/12 07:44:11 lukem Exp $
 #	@(#)bsd.prog.mk	8.2 (Berkeley) 4/2/94
 
 .ifndef HOSTPROG
@@ -57,12 +57,31 @@ __bsd_prog_mk_system_libs?= \
 .for _n in ${__bsd_prog_mk_system_libs}
 .ifndef LIB${_n}
 LIB${_n}= ${DESTDIR}/usr/lib/lib${_n:tl}.a
-# XXX - note that ${DESTDIR} will be expanded in the following rule
+# Note: ${DESTDIR} will be expanded in the following rule
 .MADE: ${LIB${_n}}
 .endif
 .endfor
 .undef __bsd_prog_mk_system_libs
 
+##### Installed X11R6 library definitions
+#     E.g. LIBX11?=${DESTDIR}/usr/X11R6/lib/libX11.a
+#     etc..
+#
+__bsd_prog_mk_x11r6_libs?= \
+	dps expat fntstubs fontcache fontconfig fontenc freetype FS \
+	GL GLU ICE lbxutil SM X11 Xau Xaw Xdmcp Xext Xfont Xft \
+	Xi Xinerama xkbfile Xmu Xmuu Xpm Xrandr Xrender Xss Xt \
+	XTrap Xtst Xv Xxf86dga Xxf86misc Xxf86vm
+
+.for _n in ${__bsd_prog_mk_x11r6_libs}
+.ifndef LIB${_n:tu}
+LIB${_n:tu}= ${DESTDIR}/usr/X11R6/lib/lib${_n}.a
+# Note: ${DESTDIR} will be expanded in the following rule
+.MADE: ${LIB${_n:tu}}
+.endif
+.endfor
+.undef __bsd_prog_mk_x11r6_libs
+
 ##### Build and install rules
 .if defined(SHAREDSTRINGS)
 CLEANFILES+=strings