3 files changed, 9 insertions, 7 deletions
diff --git a/sys/arch/luna88k/compile/Makefile b/sys/arch/luna88k/compile/Makefile
index 4c1ba402478..83dd5c4899f 100644
--- a/sys/arch/luna88k/compile/Makefile
+++ b/sys/arch/luna88k/compile/Makefile
@@ -1,8 +1,7 @@
-#	$OpenBSD: Makefile,v 1.1 2016/10/14 18:43:00 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.2 2016/10/15 13:45:08 deraadt Exp $
 
-.if	make(obj) || make(clean)
-SUBDIR!=find . -type d -maxdepth 1 \! \( -name . -o -name CVS \)
-#SUBDIR=GENERIC GENERIC.MP RAMDISK
+.if	make(obj) || make(clean) || make(cleandir)
+SUBDIR!=find . -type d -maxdepth 1 \! \( -name . -o -name CVS \) | cut -b3-
 .endif
 
 .include <bsd.subdir.mk>
diff --git a/sys/arch/luna88k/compile/Makefile.inc b/sys/arch/luna88k/compile/Makefile.inc
index d79a8803ef2..1c3a21c7e8d 100644
--- a/sys/arch/luna88k/compile/Makefile.inc
+++ b/sys/arch/luna88k/compile/Makefile.inc
@@ -11,7 +11,7 @@ config:
 config:
 	config -b ${.OBJDIR} -s ${SYSDIR} ${CONFDIR}/${.CURDIR:T}
 
-clean:
+cleandir clean:
 
 .endif
 
diff --git a/sys/arch/luna88k/conf/Makefile.luna88k b/sys/arch/luna88k/conf/Makefile.luna88k
index 21efb29ca58..d33eb5b1b38 100644
--- a/sys/arch/luna88k/conf/Makefile.luna88k
+++ b/sys/arch/luna88k/conf/Makefile.luna88k
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.luna88k,v 1.61 2016/10/14 18:43:01 deraadt Exp $
+#	$OpenBSD: Makefile.luna88k,v 1.62 2016/10/15 13:45:08 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -123,7 +123,10 @@ vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
 
 clean::
 	rm -f eddep *bsd *bsd.gdb tags *.[dio] [a-z]*.s \
-	    [Ee]rrs linterrs assym.h ${DB_STRUCTINFO}
+	    [Ee]rrs linterrs assym.* ${DB_STRUCTINFO} param.c
+
+cleandir: clean
+	rm -f Makefile *.h ioconf.c options machine ${_mach} vers.c version
 
 lint:
 	@lint -hbxncez -Dvolatile= ${CPPFLAGS} -UKGDB \