Index: etc/Makefile
===================================================================
--- etc/Makefile	(revision 290360)
+++ etc/Makefile	(working copy)
@@ -351,6 +351,9 @@
 MTREES+=	mtree/BSD.lib32.dist		/usr
 MTREES+=	mtree/BSD.lib32.dist		/usr/lib/debug/usr
 .endif
+.if ${MK_LPR} != "no"
+MTREES+=	mtree/BSD.lpr.dist		/usr
+.endif
 .if ${MK_TESTS} != "no"
 MTREES+=	mtree/BSD.tests.dist		${TESTSBASE}
 MTREES+=	mtree/BSD.tests.dist		/usr/lib/debug/${TESTSBASE}
Index: etc/mtree/BSD.include.dist
===================================================================
--- etc/mtree/BSD.include.dist	(revision 290360)
+++ etc/mtree/BSD.include.dist	(working copy)
@@ -7,10 +7,6 @@
 .
     arpa
     ..
-    atf-c
-    ..
-    atf-c++
-    ..
     bsm
     ..
     bsnmp
Index: etc/mtree/BSD.usr.dist
===================================================================
--- etc/mtree/BSD.usr.dist	(revision 290360)
+++ etc/mtree/BSD.usr.dist	(working copy)
@@ -118,10 +118,6 @@
         ..
         hyperv
         ..
-        lpr
-            ru
-            ..
-        ..
         sendmail
         ..
         sm.bin
@@ -134,8 +130,6 @@
     sbin
     ..
     share
-        atf
-        ..
         bsdconfig
             media
             ..
@@ -179,8 +173,6 @@
         doc
             IPv6
             ..
-            atf
-            ..
             atm
             ..
             legal
@@ -266,8 +258,6 @@
                 ..
                 06.nfs
                 ..
-                07.lpd
-                ..
                 08.sendmailop
                 ..
                 11.timedop
Index: etc/mtree/Makefile
===================================================================
--- etc/mtree/Makefile	(revision 290360)
+++ etc/mtree/Makefile	(working copy)
@@ -6,6 +6,7 @@
 	BSD.include.dist \
 	BSD.root.dist \
 	${_BSD.lib32.dist} \
+	${_BSD.lpr.dist} \
 	${_BSD.sendmail.dist} \
 	${_BSD.tests.dist} \
 	BSD.usr.dist \
@@ -20,6 +21,9 @@
 .if ${MK_LIB32} != "no"
 _BSD.lib32.dist=	BSD.lib32.dist
 .endif
+.if ${MK_LPR} != "no"
+_BSD.lpr.dist=		BSD.lpr.dist
+.endif
 .if ${MK_SENDMAIL} != "no"
 _BSD.sendmail.dist=	BSD.sendmail.dist
 .endif