diff --git a/sys/arch/arm32/arm32/genassym.cf b/sys/arch/arm/arm32/genassym.cf
similarity index 98%
rename from sys/arch/arm32/arm32/genassym.cf
rename to sys/arch/arm/arm32/genassym.cf
index a0ea27ec4a0f..87a9211629f6 100644
--- a/sys/arch/arm32/arm32/genassym.cf
+++ b/sys/arch/arm/arm32/genassym.cf
@@ -1,4 +1,4 @@
-#	$NetBSD: genassym.cf,v 1.8 2001/03/04 14:32:12 bjh21 Exp $
+#	$NetBSD: genassym.cf,v 1.1 2001/07/28 15:08:11 chris Exp $
 
 # Copyright (c) 1982, 1990 The Regents of the University of California.
 # All rights reserved.
diff --git a/sys/arch/arm32/arm32/locore.S b/sys/arch/arm/arm32/locore.S
similarity index 99%
rename from sys/arch/arm32/arm32/locore.S
rename to sys/arch/arm/arm32/locore.S
index 07afa5e908ac..183fca00ca93 100644
--- a/sys/arch/arm32/arm32/locore.S
+++ b/sys/arch/arm/arm32/locore.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.S,v 1.40 2001/06/11 22:08:42 chris Exp $	*/
+/*	$NetBSD: locore.S,v 1.1 2001/07/28 15:08:11 chris Exp $	*/
 
 /*
  * Copyright (C) 1994-1997 Mark Brinicombe
diff --git a/sys/arch/arm/conf/Makefile.arm b/sys/arch/arm/conf/Makefile.arm
index 59aad4ba20da..8aa1bb78243d 100644
--- a/sys/arch/arm/conf/Makefile.arm
+++ b/sys/arch/arm/conf/Makefile.arm
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.arm,v 1.5 2001/07/28 13:24:24 chris Exp $
+#	$NetBSD: Makefile.arm,v 1.6 2001/07/28 15:08:10 chris Exp $
 
 # Makefile for NetBSD
 #
@@ -31,6 +31,7 @@ TSORT?=	tsort -q
 COPTS?=	-O2
 
 ARM32=		$S/arch/arm32
+ARM=		$S/arch/arm
 THISARM=	$S/arch/${TARGET_MACHINE}
 
 HAVE_EGCS!=	${CC} --version | egrep "^(2\.[89]|egcs)" ; echo 
@@ -121,9 +122,9 @@ LINKFLAGS+=	-X
 
 %LOAD
 
-assym.h: $S/kern/genassym.sh ${ARM32}/arm32/genassym.cf
+assym.h: $S/kern/genassym.sh ${ARM}/arm32/genassym.cf
 	sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} \
-	    < ${ARM32}/arm32/genassym.cf > assym.h.tmp && \
+	    < ${ARM}/arm32/genassym.cf > assym.h.tmp && \
 	mv -f assym.h.tmp assym.h
 
 param.c: $S/conf/param.c
@@ -169,18 +170,18 @@ links:
 	  sed 's,../.*/\(.*.o\),rm -f \1; ln -s ../GENERIC/\1 \1,' > makelinks
 	sh makelinks && rm -f dontlink
 
-SRCS=	${ARM32}/arm32/locore.S param.c ioconf.c ${CFILES} ${SFILES} \
+SRCS=	${ARM}/arm32/locore.S param.c ioconf.c ${CFILES} ${SFILES} \
 	${EXTRA_CFILES} ${EXTRA_SFILES} ${SYSTEM_FIRST_SFILE}
 
 depend: .depend
 .depend: ${SRCS} assym.h param.c
 	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${SYSTEM_FIRST_SFILE} \
-	    ${ARM32}/arm32/locore.S ${EXTRA_SFILES}
+	    ${ARM}/arm32/locore.S ${EXTRA_SFILES}
 	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} \
 	    ${EXTRA_CFILES}
 	test -z "${SFILES}" || ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
 	sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} \
-	    ${CPPFLAGS} < ${ARM32}/arm32/genassym.cf
+	    ${CPPFLAGS} < ${ARM}/arm32/genassym.cf
 	@sed -e 's/.*\.o:.*\.c/assym.h:/' < assym.dep >> .depend
 	@rm -f assym.dep
 
@@ -220,7 +221,7 @@ ${SYSTEM_FIRST_OBJ}: ${SYSTEM_FIRST_SFILE} assym.h
 	${NORMAL_S}
 .endif
 
-locore.o: ${ARM32}/arm32/locore.S assym.h
+locore.o: ${ARM}/arm32/locore.S assym.h
 	${NORMAL_S}
 
 # The install target can be redefined by putting a