diff --git a/sys/arch/pc532/conf/Makefile.pc532 b/sys/arch/pc532/conf/Makefile.pc532
index 9a67cc566a23..bded9ed1afbc 100644
--- a/sys/arch/pc532/conf/Makefile.pc532
+++ b/sys/arch/pc532/conf/Makefile.pc532
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.pc532,v 1.15 1996/01/14 21:06:52 thorpej Exp $
+#	$NetBSD: Makefile.pc532,v 1.16 1996/02/01 03:00:57 phil Exp $
 
 # Copyright 1990 W. Jolitz
 # 	@(#)Makefile.i386	7.1 5/10/91
@@ -86,7 +86,7 @@ clean::
 #	    grep -v 'possible pointer alignment problem'
 
 locore.o: assym.h ${PC532}/pc532/locore.s \
-	${PC532}/pc532/bcopy.s ${PC532}/pc532/bzero.s
+	${PC532}/pc532/bcopy.s 
 
 # the following is necessary because autoconf.o depends on #if GENERIC
 autoconf.o: Makefile
diff --git a/sys/arch/pc532/conf/SALMON b/sys/arch/pc532/conf/SALMON
new file mode 100644
index 000000000000..927a2680395d
--- /dev/null
+++ b/sys/arch/pc532/conf/SALMON
@@ -0,0 +1,86 @@
+#	$NetBSD: SALMON,v 1.1 1996/02/01 03:01:39 phil Exp $
+#
+# SALMON: Phil Nelson's 2nd (test) pc532 
+#
+machine		"pc532"
+
+maxusers	10			# estimated number of users
+options		TIMEZONE=0, DST=0	# time zone to read RTC in
+options		SWAPPAGER		# paging
+options		VNODEPAGER,DEVPAGER	# vnode and device node caching
+#options	DDB			# kernel debugger; not working
+#options	DIAGNOSTIC		# internal consistency checking
+
+#options	ACCOUNTING		# process accounting
+options		KTRACE			# system call tracing, a la ktrace(1)
+options		FIFO			# fifos; recommended
+#options	SYSVSHM			# System V shared memory; broken
+#options	"SHMMAXPGS=1024"
+#options	LKM			# loadable kernel modules
+
+# compatibility options
+options		"COMPAT_43"		# 4.3 system calls
+options		"TCP_COMPAT_42"		# 4.2 networking ABI
+options		"COMPAT_09"		# NetBSD-0.9
+options		"COMPAT_10"		# NetBSD-1.0
+
+# file system options
+#options	QUOTA			# file system quotas
+options		FFS			# Berkeley fast file system
+#options	FASTLINKS		# fast symbolic links in FFS
+#options	MFS			# memory file system; uses RAM and swap
+options		NFSSERVER		# Network File System server
+options		NFSCLIENT		# Network File System client
+#options	ISOFS			# ISO 9660 CD-ROM file system, with RR
+#options	MSDOSFS			# MS-DOS FAT file system
+options		FDESC			# /dev/fd
+options		KERNFS			# kernel file system; recommended
+
+# networking options
+#options	GATEWAY			# packet forwarding
+options		INET			# IP
+#options	NS			# XNS
+#options	CCITT			# X.25
+#options	ISO			# OSI
+#options	TPIP			# ?
+#options	EON			# ?
+
+# pc532 specific options
+#options	"CONSOLE_SPEED=B9600"	# default baud on the console (tty00)
+#options	"RAMD_SIZE=1536000"	# Size of the "boot strap ram disk"
+#options	"RAMD_ADR=0x400000"	# Adr of the "boot strap ram disk"
+options		"CONFIG_NEW"		# Use config.new stuff
+options		"DEV_RTC"		# /dev/rtc access to hardware clock
+options		"CON_BRK_PANIC"		# 3 breaks on tty0 -> panic? y/n
+
+config		"netbsd"	root on sd0 swap on sd0 and sd1 and vnd0a
+
+membus0 at root
+
+#rd0 at membus?
+
+ncr0 at membus?
+#oldncr0 at membus?
+
+scsibus0 at scsi?
+
+sd* at scsibus? target ? lun ?			# SCSI disks
+st* at scsibus? target ? lun ?			# SCSI tapes
+#cd* at scsibus? target ? lun ?			# SCSI ???
+
+scn0 at membus?
+scn1 at membus?
+scn2 at membus?
+scn3 at membus?
+scn4 at membus?
+scn5 at membus?
+scn6 at membus?
+scn7 at membus?
+
+pseudo-device	pty 16			# pseudo-terminals
+pseudo-device	loop 1			# loopback network
+pseudo-device	bpfilter 4		# packet filter
+pseudo-device	sl 2			# compressed SLIP
+pseudo-device	ppp 2			# Point-to-Point Protocol
+pseudo-device   vnd 4			# Vnode devices
+#pseudo-device	ether			#