diff --git a/Makefile b/Makefile
index 469a74f376eb..ba7746a62b52 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #
-#	$Id: Makefile,v 1.44 1995/03/14 21:32:46 roberto Exp $
+#	$Id: Makefile,v 1.45 1995/03/17 04:59:44 phk Exp $
 #
 # Make command line options:
 #	-DCLOBBER will remove /usr/include and MOST of /usr/lib 
@@ -195,10 +195,9 @@ includes:
 	@echo "--------------------------------------------------------------"
 	@echo
 .if defined(CLOBBER)
-	rm -rf ${DESTDIR}/usr/include
-	mkdir ${DESTDIR}/usr/include
-	chown ${BINOWN}.${BINGRP} ${DESTDIR}/usr/include
-	chmod 755 ${DESTDIR}/usr/include
+	rm -rf ${DESTDIR}/usr/include/*
+	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
+		-p ${DESTDIR}/usr/include
 .endif
 	cd ${.CURDIR}/include &&		${MAKE} install
 	cd ${.CURDIR}/gnu/include &&		${MAKE}	install
diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist
new file mode 100644
index 000000000000..0c6a9485d1b5
--- /dev/null
+++ b/etc/mtree/BSD.include.dist
@@ -0,0 +1,52 @@
+#	$Id$
+#
+
+/set type=dir uname=bin gname=bin mode=0755
+.              
+    arpa           
+    ..
+    g++            
+    ..
+    kerberosIV     
+    ..
+    machine        
+    ..
+    net            
+    ..
+    netccitt       
+    ..
+    netinet        
+    ..
+    netiso         
+    ..
+    netns          
+    ..
+    nfs            
+    ..
+    objc           
+    ..
+    protocols      
+    ..
+    readline       
+    ..
+    rpc            
+    ..
+    rpcsvc         
+    ..
+    ss             
+    ..
+    sys            
+    ..
+    ufs            
+        ffs            
+        ..
+        lfs            
+        ..
+        mfs            
+        ..
+        ufs            
+        ..
+    ..
+    vm             
+    ..
+..