diff --git a/sys/pic32/Makefile.kconf b/sys/pic32/Makefile.kconf
index 6cac4fe..604ade9 100644
--- a/sys/pic32/Makefile.kconf
+++ b/sys/pic32/Makefile.kconf
@@ -9,7 +9,7 @@ AS              = ${MIPS_GCC_PREFIX}as ${DEBUG} -mips32r2 -EL
 CC              = ${MIPS_GCC_PREFIX}gcc ${DEBUG} -mips32r2 -EL -nostdinc -fno-builtin -Werror -Wall
 CPP             = ${MIPS_GCC_PREFIX}cpp
 LD              = ${MIPS_GCC_PREFIX}gcc -mips32r2 -EL
-LDFLAGS         = -nostdlib -T ../${LDSCRIPT} -Wl,-Map=unix.map
+LDFLAGS         = -nostdlib -T ../${LDSCRIPT} -Wl,-Map=$(basename $@).map
 SIZE            = ${MIPS_GCC_PREFIX}size
 OBJCOPY         = ${MIPS_GCC_PREFIX}objcopy
 OBJDUMP         = ${MIPS_GCC_PREFIX}objdump
@@ -44,14 +44,14 @@ SYSTEM_OBJ      = startup.o ${OBJS} #ioconf.o
 ifeq (devcfg.c,$(wildcard devcfg.c))
     SYSTEM_OBJ  += devcfg.o
 endif
-SYSTEM_DEP      = Makefile ioconf.c swapunix.c machine sys .deps ${SYSTEM_OBJ}
+SYSTEM_DEP      = Makefile ioconf.c machine sys .deps ${SYSTEM_OBJ}
 SYSTEM_LD_HEAD  = sh ../newvers.sh > vers.c; ${CC} $(CFLAGS) -c vers.c; rm -f $@
-SYSTEM_LD       = -@echo ${LD} ${LDFLAGS} '$${SYSTEM_OBJ}' vers.o -o unix.elf; \
-                  ${LD} ${LDFLAGS} ${SYSTEM_OBJ} vers.o -o unix.elf
-SYSTEM_LD_TAIL  = ${SIZE} unix.elf; \
-                  $(OBJCOPY) -O ihex --change-addresses=0x80000000 $@ unix.hex; \
-                  $(OBJCOPY) -O binary -R .boot -R .config $@ unix.bin; \
-                  $(OBJDUMP) -d -S unix.elf > unix.dis
+SYSTEM_LD       = -@echo ${LD} ${LDFLAGS} '$${SYSTEM_OBJ}' vers.o -o $@; \
+                  ${LD} ${LDFLAGS} ${SYSTEM_OBJ} vers.o -o $@
+SYSTEM_LD_TAIL  = ${SIZE} $@; \
+                  $(OBJCOPY) -O ihex --change-addresses=0x80000000 $@ $(basename $@).hex; \
+                  $(OBJCOPY) -O binary -R .boot -R .config $@ $(basename $@).bin; \
+                  $(OBJDUMP) -d -S $@ > $(basename $@).dis
 
 %LOAD
 
@@ -59,11 +59,12 @@ clean:
 	rm -rf .deps *.elf *.o *.map *.dis *.bin machine sys
 
 clean-all: clean
-	rm -f *.h ioconf.c swapunix.c vers.c
+	rm -f *.h *.hex ioconf.c swap*.c vers.c
 
-reconfig ioconf.c swapunix.c: Config ../../../tools/kconfig/kconfig
+reconfig ioconf.c: Config ../../../tools/kconfig/kconfig
 	../../../tools/kconfig/kconfig Config
 	$(MAKE) clean
+	rm -f *.hex
 
 load:   unix.elf
 	pic32prog unix.hex
diff --git a/sys/pic32/duinomite-emega/Config b/sys/pic32/duinomite-emega/Config
index 4a76473..cae353a 100644
--- a/sys/pic32/duinomite-emega/Config
+++ b/sys/pic32/duinomite-emega/Config
@@ -34,7 +34,6 @@ options         "LED_DISK_PIN=1"            # ...use pin RC1
 # Root filesystem at /dev/sd0a, swap at /dev/sd0b
 config          unix    root on sd0a
                         swap on sd0b
-                        dumps on sd0b
 
 # Console options
 options         "CONSOLE_DEVICE=ttyUSB0"    # Console on USB
diff --git a/sys/pic32/duinomite-emega/Config-uart b/sys/pic32/duinomite-emega/Config-uart
index cee16b2..80a7fe4 100644
--- a/sys/pic32/duinomite-emega/Config-uart
+++ b/sys/pic32/duinomite-emega/Config-uart
@@ -34,7 +34,6 @@ options         "LED_DISK_PIN=1"            # ...use pin RC1
 # Root filesystem at /dev/sd0a, swap at /dev/sd0b
 config          unix    root on sd0a
                         swap on sd0b
-                        dumps on sd0b
 
 # Console options
 options         "CONSOLE_DEVICE=tty4"       # Console on UART5
diff --git a/sys/pic32/duinomite-emega/Makefile b/sys/pic32/duinomite-emega/Makefile
index 71cac18..7f9246b 100644
--- a/sys/pic32/duinomite-emega/Makefile
+++ b/sys/pic32/duinomite-emega/Makefile
@@ -33,7 +33,7 @@ AS              = ${MIPS_GCC_PREFIX}as ${DEBUG} -mips32r2 -EL
 CC              = ${MIPS_GCC_PREFIX}gcc ${DEBUG} -mips32r2 -EL -nostdinc -fno-builtin -Werror -Wall
 CPP             = ${MIPS_GCC_PREFIX}cpp
 LD              = ${MIPS_GCC_PREFIX}gcc -mips32r2 -EL
-LDFLAGS         = -nostdlib -T ../${LDSCRIPT} -Wl,-Map=unix.map
+LDFLAGS         = -nostdlib -T ../${LDSCRIPT} -Wl,-Map=$(basename $@).map
 SIZE            = ${MIPS_GCC_PREFIX}size
 OBJCOPY         = ${MIPS_GCC_PREFIX}objcopy
 OBJDUMP         = ${MIPS_GCC_PREFIX}objdump
@@ -106,14 +106,16 @@ SYSTEM_OBJ      = startup.o ${OBJS} #ioconf.o
 ifeq (devcfg.c,$(wildcard devcfg.c))
     SYSTEM_OBJ  += devcfg.o
 endif
-SYSTEM_DEP      = Makefile ioconf.c swapunix.c machine sys .deps ${SYSTEM_OBJ}
+SYSTEM_DEP      = Makefile ioconf.c machine sys .deps ${SYSTEM_OBJ}
 SYSTEM_LD_HEAD  = sh ../newvers.sh > vers.c; ${CC} $(CFLAGS) -c vers.c; rm -f $@
-SYSTEM_LD       = -@echo ${LD} ${LDFLAGS} '$${SYSTEM_OBJ}' vers.o -o unix.elf; \
-                  ${LD} ${LDFLAGS} ${SYSTEM_OBJ} vers.o -o unix.elf
-SYSTEM_LD_TAIL  = ${SIZE} unix.elf; \
-                  $(OBJCOPY) -O ihex --change-addresses=0x80000000 $@ unix.hex; \
-                  $(OBJCOPY) -O binary -R .boot -R .config $@ unix.bin; \
-                  $(OBJDUMP) -d -S unix.elf > unix.dis
+SYSTEM_LD       = -@echo ${LD} ${LDFLAGS} '$${SYSTEM_OBJ}' vers.o -o $@; \
+                  ${LD} ${LDFLAGS} ${SYSTEM_OBJ} vers.o -o $@
+SYSTEM_LD_TAIL  = ${SIZE} $@; \
+                  $(OBJCOPY) -O ihex --change-addresses=0x80000000 $@ $(basename $@).hex; \
+                  $(OBJCOPY) -O binary -R .boot -R .config $@ $(basename $@).bin; \
+                  $(OBJDUMP) -d -S $@ > $(basename $@).dis
+
+unix: unix.elf
 
 unix.elf: ${SYSTEM_DEP} swapunix.o
 	${SYSTEM_LD_HEAD}
@@ -123,17 +125,18 @@ unix.elf: ${SYSTEM_DEP} swapunix.o
 swapunix.o: swapunix.c
 	${COMPILE_C}
 
-all: unix.elf
+all: unix
 
 clean:
 	rm -rf .deps *.elf *.o *.map *.dis *.bin machine sys
 
 clean-all: clean
-	rm -f *.h ioconf.c swapunix.c vers.c
+	rm -f *.h *.hex ioconf.c swap*.c vers.c
 
-reconfig ioconf.c swapunix.c: Config ../../../tools/kconfig/kconfig
+reconfig ioconf.c: Config ../../../tools/kconfig/kconfig
 	../../../tools/kconfig/kconfig Config
 	$(MAKE) clean
+	rm -f *.hex
 
 load:   unix.elf
 	pic32prog unix.hex
diff --git a/sys/pic32/duinomite/Config b/sys/pic32/duinomite/Config
index dddcc1b..33998d0 100644
--- a/sys/pic32/duinomite/Config
+++ b/sys/pic32/duinomite/Config
@@ -33,7 +33,6 @@ options         "LED_DISK_PIN=12"           # ...use pin RB12
 # Root filesystem at /dev/sd0a, swap at /dev/sd0b
 config          unix    root on sd0a
                         swap on sd0b
-                        dumps on sd0b
 
 # Console options
 options         "CONSOLE_DEVICE=ttyUSB0"    # Console on USB
diff --git a/sys/pic32/duinomite/Config-uart b/sys/pic32/duinomite/Config-uart
index 0940452..1347c9d 100644
--- a/sys/pic32/duinomite/Config-uart
+++ b/sys/pic32/duinomite/Config-uart
@@ -33,7 +33,6 @@ options         "LED_DISK_PIN=12"           # ...use pin RB12
 # Root filesystem at /dev/sd0a, swap at /dev/sd0b
 config          unix    root on sd0a
                         swap on sd0b
-                        dumps on sd0b
 
 # Console options
 options         "CONSOLE_DEVICE=tty4"       # Console on UART5
diff --git a/sys/pic32/duinomite/Makefile b/sys/pic32/duinomite/Makefile
index 52ca9e5..2a2a72f 100644
--- a/sys/pic32/duinomite/Makefile
+++ b/sys/pic32/duinomite/Makefile
@@ -33,7 +33,7 @@ AS              = ${MIPS_GCC_PREFIX}as ${DEBUG} -mips32r2 -EL
 CC              = ${MIPS_GCC_PREFIX}gcc ${DEBUG} -mips32r2 -EL -nostdinc -fno-builtin -Werror -Wall
 CPP             = ${MIPS_GCC_PREFIX}cpp
 LD              = ${MIPS_GCC_PREFIX}gcc -mips32r2 -EL
-LDFLAGS         = -nostdlib -T ../${LDSCRIPT} -Wl,-Map=unix.map
+LDFLAGS         = -nostdlib -T ../${LDSCRIPT} -Wl,-Map=$(basename $@).map
 SIZE            = ${MIPS_GCC_PREFIX}size
 OBJCOPY         = ${MIPS_GCC_PREFIX}objcopy
 OBJDUMP         = ${MIPS_GCC_PREFIX}objdump
@@ -106,14 +106,16 @@ SYSTEM_OBJ      = startup.o ${OBJS} #ioconf.o
 ifeq (devcfg.c,$(wildcard devcfg.c))
     SYSTEM_OBJ  += devcfg.o
 endif
-SYSTEM_DEP      = Makefile ioconf.c swapunix.c machine sys .deps ${SYSTEM_OBJ}
+SYSTEM_DEP      = Makefile ioconf.c machine sys .deps ${SYSTEM_OBJ}
 SYSTEM_LD_HEAD  = sh ../newvers.sh > vers.c; ${CC} $(CFLAGS) -c vers.c; rm -f $@
-SYSTEM_LD       = -@echo ${LD} ${LDFLAGS} '$${SYSTEM_OBJ}' vers.o -o unix.elf; \
-                  ${LD} ${LDFLAGS} ${SYSTEM_OBJ} vers.o -o unix.elf
-SYSTEM_LD_TAIL  = ${SIZE} unix.elf; \
-                  $(OBJCOPY) -O ihex --change-addresses=0x80000000 $@ unix.hex; \
-                  $(OBJCOPY) -O binary -R .boot -R .config $@ unix.bin; \
-                  $(OBJDUMP) -d -S unix.elf > unix.dis
+SYSTEM_LD       = -@echo ${LD} ${LDFLAGS} '$${SYSTEM_OBJ}' vers.o -o $@; \
+                  ${LD} ${LDFLAGS} ${SYSTEM_OBJ} vers.o -o $@
+SYSTEM_LD_TAIL  = ${SIZE} $@; \
+                  $(OBJCOPY) -O ihex --change-addresses=0x80000000 $@ $(basename $@).hex; \
+                  $(OBJCOPY) -O binary -R .boot -R .config $@ $(basename $@).bin; \
+                  $(OBJDUMP) -d -S $@ > $(basename $@).dis
+
+unix: unix.elf
 
 unix.elf: ${SYSTEM_DEP} swapunix.o
 	${SYSTEM_LD_HEAD}
@@ -123,17 +125,18 @@ unix.elf: ${SYSTEM_DEP} swapunix.o
 swapunix.o: swapunix.c
 	${COMPILE_C}
 
-all: unix.elf
+all: unix
 
 clean:
 	rm -rf .deps *.elf *.o *.map *.dis *.bin machine sys
 
 clean-all: clean
-	rm -f *.h ioconf.c swapunix.c vers.c
+	rm -f *.h *.hex ioconf.c swap*.c vers.c
 
-reconfig ioconf.c swapunix.c: Config ../../../tools/kconfig/kconfig
+reconfig ioconf.c: Config ../../../tools/kconfig/kconfig
 	../../../tools/kconfig/kconfig Config
 	$(MAKE) clean
+	rm -f *.hex
 
 load:   unix.elf
 	pic32prog unix.hex
diff --git a/sys/pic32/fubarino/Config b/sys/pic32/fubarino/Config
index 385e630..7602b8a 100644
--- a/sys/pic32/fubarino/Config
+++ b/sys/pic32/fubarino/Config
@@ -31,7 +31,6 @@ options         "LED_KERNEL_PIN=5"          # ...use pin RE5
 # Root filesystem at /dev/sd0a, swap at /dev/sd0b
 config          unix    root on sd0a
                         swap on sd0b
-                        dumps on sd0b
 
 # Console options
 options         "CONSOLE_DEVICE=ttyUSB0"    # Console on USB
diff --git a/sys/pic32/fubarino/Config-uart-sramc b/sys/pic32/fubarino/Config-uart-sramc
index f462f84..a9ce476 100644
--- a/sys/pic32/fubarino/Config-uart-sramc
+++ b/sys/pic32/fubarino/Config-uart-sramc
@@ -35,7 +35,6 @@ options         "LED_KERNEL_PIN=5"          # ...use pin RE5
 # Root filesystem at /dev/sd0a, swap at /dev/sd0b
 config          unix    root on sd0a
                         swap on sd0b
-                        dumps on sd0b
 
 # Console options
 options         "CONSOLE_DEVICE=tty1"       # Console on UART2
diff --git a/sys/pic32/fubarino/Makefile b/sys/pic32/fubarino/Makefile
index 7534894..dee83e3 100644
--- a/sys/pic32/fubarino/Makefile
+++ b/sys/pic32/fubarino/Makefile
@@ -30,7 +30,7 @@ AS              = ${MIPS_GCC_PREFIX}as ${DEBUG} -mips32r2 -EL
 CC              = ${MIPS_GCC_PREFIX}gcc ${DEBUG} -mips32r2 -EL -nostdinc -fno-builtin -Werror -Wall
 CPP             = ${MIPS_GCC_PREFIX}cpp
 LD              = ${MIPS_GCC_PREFIX}gcc -mips32r2 -EL
-LDFLAGS         = -nostdlib -T ../${LDSCRIPT} -Wl,-Map=unix.map
+LDFLAGS         = -nostdlib -T ../${LDSCRIPT} -Wl,-Map=$(basename $@).map
 SIZE            = ${MIPS_GCC_PREFIX}size
 OBJCOPY         = ${MIPS_GCC_PREFIX}objcopy
 OBJDUMP         = ${MIPS_GCC_PREFIX}objdump
@@ -103,14 +103,16 @@ SYSTEM_OBJ      = startup.o ${OBJS} #ioconf.o
 ifeq (devcfg.c,$(wildcard devcfg.c))
     SYSTEM_OBJ  += devcfg.o
 endif
-SYSTEM_DEP      = Makefile ioconf.c swapunix.c machine sys .deps ${SYSTEM_OBJ}
+SYSTEM_DEP      = Makefile ioconf.c machine sys .deps ${SYSTEM_OBJ}
 SYSTEM_LD_HEAD  = sh ../newvers.sh > vers.c; ${CC} $(CFLAGS) -c vers.c; rm -f $@
-SYSTEM_LD       = -@echo ${LD} ${LDFLAGS} '$${SYSTEM_OBJ}' vers.o -o unix.elf; \
-                  ${LD} ${LDFLAGS} ${SYSTEM_OBJ} vers.o -o unix.elf
-SYSTEM_LD_TAIL  = ${SIZE} unix.elf; \
-                  $(OBJCOPY) -O ihex --change-addresses=0x80000000 $@ unix.hex; \
-                  $(OBJCOPY) -O binary -R .boot -R .config $@ unix.bin; \
-                  $(OBJDUMP) -d -S unix.elf > unix.dis
+SYSTEM_LD       = -@echo ${LD} ${LDFLAGS} '$${SYSTEM_OBJ}' vers.o -o $@; \
+                  ${LD} ${LDFLAGS} ${SYSTEM_OBJ} vers.o -o $@
+SYSTEM_LD_TAIL  = ${SIZE} $@; \
+                  $(OBJCOPY) -O ihex --change-addresses=0x80000000 $@ $(basename $@).hex; \
+                  $(OBJCOPY) -O binary -R .boot -R .config $@ $(basename $@).bin; \
+                  $(OBJDUMP) -d -S $@ > $(basename $@).dis
+
+unix: unix.elf
 
 unix.elf: ${SYSTEM_DEP} swapunix.o
 	${SYSTEM_LD_HEAD}
@@ -120,17 +122,18 @@ unix.elf: ${SYSTEM_DEP} swapunix.o
 swapunix.o: swapunix.c
 	${COMPILE_C}
 
-all: unix.elf
+all: unix
 
 clean:
 	rm -rf .deps *.elf *.o *.map *.dis *.bin machine sys
 
 clean-all: clean
-	rm -f *.h ioconf.c swapunix.c vers.c
+	rm -f *.h *.hex ioconf.c swap*.c vers.c
 
-reconfig ioconf.c swapunix.c: Config ../../../tools/kconfig/kconfig
+reconfig ioconf.c: Config ../../../tools/kconfig/kconfig
 	../../../tools/kconfig/kconfig Config
 	$(MAKE) clean
+	rm -f *.hex
 
 load:   unix.elf
 	pic32prog unix.hex
diff --git a/sys/pic32/max32/Config b/sys/pic32/max32/Config
index 464b2ab..c71a3f8 100644
--- a/sys/pic32/max32/Config
+++ b/sys/pic32/max32/Config
@@ -30,7 +30,6 @@ options         "LED_KERNEL_PIN=3"          # ...use pin RA3
 # Root filesystem at /dev/sd0a, swap at /dev/sd0b
 config          unix    root on sd0a
                         swap on sd0b
-                        dumps on sd0b
 
 # Serial UART ports
 device          uart1                       # Serial-to-USB converter
diff --git a/sys/pic32/max32/Makefile b/sys/pic32/max32/Makefile
index 7266668..095f0e8 100644
--- a/sys/pic32/max32/Makefile
+++ b/sys/pic32/max32/Makefile
@@ -31,7 +31,7 @@ AS              = ${MIPS_GCC_PREFIX}as ${DEBUG} -mips32r2 -EL
 CC              = ${MIPS_GCC_PREFIX}gcc ${DEBUG} -mips32r2 -EL -nostdinc -fno-builtin -Werror -Wall
 CPP             = ${MIPS_GCC_PREFIX}cpp
 LD              = ${MIPS_GCC_PREFIX}gcc -mips32r2 -EL
-LDFLAGS         = -nostdlib -T ../${LDSCRIPT} -Wl,-Map=unix.map
+LDFLAGS         = -nostdlib -T ../${LDSCRIPT} -Wl,-Map=$(basename $@).map
 SIZE            = ${MIPS_GCC_PREFIX}size
 OBJCOPY         = ${MIPS_GCC_PREFIX}objcopy
 OBJDUMP         = ${MIPS_GCC_PREFIX}objdump
@@ -102,14 +102,16 @@ SYSTEM_OBJ      = startup.o ${OBJS} #ioconf.o
 ifeq (devcfg.c,$(wildcard devcfg.c))
     SYSTEM_OBJ  += devcfg.o
 endif
-SYSTEM_DEP      = Makefile ioconf.c swapunix.c machine sys .deps ${SYSTEM_OBJ}
+SYSTEM_DEP      = Makefile ioconf.c machine sys .deps ${SYSTEM_OBJ}
 SYSTEM_LD_HEAD  = sh ../newvers.sh > vers.c; ${CC} $(CFLAGS) -c vers.c; rm -f $@
-SYSTEM_LD       = -@echo ${LD} ${LDFLAGS} '$${SYSTEM_OBJ}' vers.o -o unix.elf; \
-                  ${LD} ${LDFLAGS} ${SYSTEM_OBJ} vers.o -o unix.elf
-SYSTEM_LD_TAIL  = ${SIZE} unix.elf; \
-                  $(OBJCOPY) -O ihex --change-addresses=0x80000000 $@ unix.hex; \
-                  $(OBJCOPY) -O binary -R .boot -R .config $@ unix.bin; \
-                  $(OBJDUMP) -d -S unix.elf > unix.dis
+SYSTEM_LD       = -@echo ${LD} ${LDFLAGS} '$${SYSTEM_OBJ}' vers.o -o $@; \
+                  ${LD} ${LDFLAGS} ${SYSTEM_OBJ} vers.o -o $@
+SYSTEM_LD_TAIL  = ${SIZE} $@; \
+                  $(OBJCOPY) -O ihex --change-addresses=0x80000000 $@ $(basename $@).hex; \
+                  $(OBJCOPY) -O binary -R .boot -R .config $@ $(basename $@).bin; \
+                  $(OBJDUMP) -d -S $@ > $(basename $@).dis
+
+unix: unix.elf
 
 unix.elf: ${SYSTEM_DEP} swapunix.o
 	${SYSTEM_LD_HEAD}
@@ -119,17 +121,18 @@ unix.elf: ${SYSTEM_DEP} swapunix.o
 swapunix.o: swapunix.c
 	${COMPILE_C}
 
-all: unix.elf
+all: unix
 
 clean:
 	rm -rf .deps *.elf *.o *.map *.dis *.bin machine sys
 
 clean-all: clean
-	rm -f *.h ioconf.c swapunix.c vers.c
+	rm -f *.h *.hex ioconf.c swap*.c vers.c
 
-reconfig ioconf.c swapunix.c: Config ../../../tools/kconfig/kconfig
+reconfig ioconf.c: Config ../../../tools/kconfig/kconfig
 	../../../tools/kconfig/kconfig Config
 	$(MAKE) clean
+	rm -f *.hex
 
 load:   unix.elf
 	pic32prog unix.hex
diff --git a/sys/pic32/picadillo/Config b/sys/pic32/picadillo/Config
index 4e4ed68..6dfdffa 100644
--- a/sys/pic32/picadillo/Config
+++ b/sys/pic32/picadillo/Config
@@ -27,7 +27,6 @@ options         "BUS_DIV=1"                 # Bus clock divisor 1/2/4/8
 # Root filesystem at /dev/sd0a, swap at /dev/sd0b
 config          unix    root on sd0a
                         swap on sd0b
-                        dumps on sd0b
 
 # Serial UART ports
 device          uart1                       # Serial-to-USB converter
diff --git a/sys/pic32/picadillo/Config-rambo b/sys/pic32/picadillo/Config-rambo
index 0002a6b..c4df38a 100644
--- a/sys/pic32/picadillo/Config-rambo
+++ b/sys/pic32/picadillo/Config-rambo
@@ -27,7 +27,6 @@ options         "BUS_DIV=1"                 # Bus clock divisor 1/2/4/8
 # Root filesystem at /dev/sd0a, swap at /dev/sd0b
 config          unix    root on sd0a
                         swap on sd0b
-                        dumps on sd0b
 
 # Serial UART ports
 device          uart1                       # Serial-to-USB converter
diff --git a/sys/pic32/picadillo/Makefile b/sys/pic32/picadillo/Makefile
index bdf929e..91f10d3 100644
--- a/sys/pic32/picadillo/Makefile
+++ b/sys/pic32/picadillo/Makefile
@@ -27,7 +27,7 @@ AS              = ${MIPS_GCC_PREFIX}as ${DEBUG} -mips32r2 -EL
 CC              = ${MIPS_GCC_PREFIX}gcc ${DEBUG} -mips32r2 -EL -nostdinc -fno-builtin -Werror -Wall
 CPP             = ${MIPS_GCC_PREFIX}cpp
 LD              = ${MIPS_GCC_PREFIX}gcc -mips32r2 -EL
-LDFLAGS         = -nostdlib -T ../${LDSCRIPT} -Wl,-Map=unix.map
+LDFLAGS         = -nostdlib -T ../${LDSCRIPT} -Wl,-Map=$(basename $@).map
 SIZE            = ${MIPS_GCC_PREFIX}size
 OBJCOPY         = ${MIPS_GCC_PREFIX}objcopy
 OBJDUMP         = ${MIPS_GCC_PREFIX}objdump
@@ -99,14 +99,16 @@ SYSTEM_OBJ      = startup.o ${OBJS} #ioconf.o
 ifeq (devcfg.c,$(wildcard devcfg.c))
     SYSTEM_OBJ  += devcfg.o
 endif
-SYSTEM_DEP      = Makefile ioconf.c swapunix.c machine sys .deps ${SYSTEM_OBJ}
+SYSTEM_DEP      = Makefile ioconf.c machine sys .deps ${SYSTEM_OBJ}
 SYSTEM_LD_HEAD  = sh ../newvers.sh > vers.c; ${CC} $(CFLAGS) -c vers.c; rm -f $@
-SYSTEM_LD       = -@echo ${LD} ${LDFLAGS} '$${SYSTEM_OBJ}' vers.o -o unix.elf; \
-                  ${LD} ${LDFLAGS} ${SYSTEM_OBJ} vers.o -o unix.elf
-SYSTEM_LD_TAIL  = ${SIZE} unix.elf; \
-                  $(OBJCOPY) -O ihex --change-addresses=0x80000000 $@ unix.hex; \
-                  $(OBJCOPY) -O binary -R .boot -R .config $@ unix.bin; \
-                  $(OBJDUMP) -d -S unix.elf > unix.dis
+SYSTEM_LD       = -@echo ${LD} ${LDFLAGS} '$${SYSTEM_OBJ}' vers.o -o $@; \
+                  ${LD} ${LDFLAGS} ${SYSTEM_OBJ} vers.o -o $@
+SYSTEM_LD_TAIL  = ${SIZE} $@; \
+                  $(OBJCOPY) -O ihex --change-addresses=0x80000000 $@ $(basename $@).hex; \
+                  $(OBJCOPY) -O binary -R .boot -R .config $@ $(basename $@).bin; \
+                  $(OBJDUMP) -d -S $@ > $(basename $@).dis
+
+unix: unix.elf
 
 unix.elf: ${SYSTEM_DEP} swapunix.o
 	${SYSTEM_LD_HEAD}
@@ -116,17 +118,18 @@ unix.elf: ${SYSTEM_DEP} swapunix.o
 swapunix.o: swapunix.c
 	${COMPILE_C}
 
-all: unix.elf
+all: unix
 
 clean:
 	rm -rf .deps *.elf *.o *.map *.dis *.bin machine sys
 
 clean-all: clean
-	rm -f *.h ioconf.c swapunix.c vers.c
+	rm -f *.h *.hex ioconf.c swap*.c vers.c
 
-reconfig ioconf.c swapunix.c: Config ../../../tools/kconfig/kconfig
+reconfig ioconf.c: Config ../../../tools/kconfig/kconfig
 	../../../tools/kconfig/kconfig Config
 	$(MAKE) clean
+	rm -f *.hex
 
 load:   unix.elf
 	pic32prog unix.hex
diff --git a/sys/pic32/ubw32/Config b/sys/pic32/ubw32/Config
index c0816f5..654cff1 100644
--- a/sys/pic32/ubw32/Config
+++ b/sys/pic32/ubw32/Config
@@ -42,7 +42,6 @@ options         "LED_TTY_INVERT"
 # Root filesystem at /dev/sd0a, swap at /dev/sd0b
 config          unix    root on sd0a
                         swap on sd0b
-                        dumps on sd0b
 
 # Console options
 options         "CONSOLE_DEVICE=ttyUSB0"    # Console on USB
diff --git a/sys/pic32/ubw32/Config-uart b/sys/pic32/ubw32/Config-uart
index bc6d16c..6a7d6fa 100644
--- a/sys/pic32/ubw32/Config-uart
+++ b/sys/pic32/ubw32/Config-uart
@@ -41,7 +41,6 @@ options         "LED_TTY_INVERT"
 # Root filesystem at /dev/sd0a, swap at /dev/sd0b
 config          unix    root on sd0a
                         swap on sd0b
-                        dumps on sd0b
 
 # Console options
 options         "CONSOLE_DEVICE=tty1"       # Console on UART2
diff --git a/sys/pic32/ubw32/Makefile b/sys/pic32/ubw32/Makefile
index 924c12d..7263383 100644
--- a/sys/pic32/ubw32/Makefile
+++ b/sys/pic32/ubw32/Makefile
@@ -42,7 +42,7 @@ AS              = ${MIPS_GCC_PREFIX}as ${DEBUG} -mips32r2 -EL
 CC              = ${MIPS_GCC_PREFIX}gcc ${DEBUG} -mips32r2 -EL -nostdinc -fno-builtin -Werror -Wall
 CPP             = ${MIPS_GCC_PREFIX}cpp
 LD              = ${MIPS_GCC_PREFIX}gcc -mips32r2 -EL
-LDFLAGS         = -nostdlib -T ../${LDSCRIPT} -Wl,-Map=unix.map
+LDFLAGS         = -nostdlib -T ../${LDSCRIPT} -Wl,-Map=$(basename $@).map
 SIZE            = ${MIPS_GCC_PREFIX}size
 OBJCOPY         = ${MIPS_GCC_PREFIX}objcopy
 OBJDUMP         = ${MIPS_GCC_PREFIX}objdump
@@ -115,14 +115,16 @@ SYSTEM_OBJ      = startup.o ${OBJS} #ioconf.o
 ifeq (devcfg.c,$(wildcard devcfg.c))
     SYSTEM_OBJ  += devcfg.o
 endif
-SYSTEM_DEP      = Makefile ioconf.c swapunix.c machine sys .deps ${SYSTEM_OBJ}
+SYSTEM_DEP      = Makefile ioconf.c machine sys .deps ${SYSTEM_OBJ}
 SYSTEM_LD_HEAD  = sh ../newvers.sh > vers.c; ${CC} $(CFLAGS) -c vers.c; rm -f $@
-SYSTEM_LD       = -@echo ${LD} ${LDFLAGS} '$${SYSTEM_OBJ}' vers.o -o unix.elf; \
-                  ${LD} ${LDFLAGS} ${SYSTEM_OBJ} vers.o -o unix.elf
-SYSTEM_LD_TAIL  = ${SIZE} unix.elf; \
-                  $(OBJCOPY) -O ihex --change-addresses=0x80000000 $@ unix.hex; \
-                  $(OBJCOPY) -O binary -R .boot -R .config $@ unix.bin; \
-                  $(OBJDUMP) -d -S unix.elf > unix.dis
+SYSTEM_LD       = -@echo ${LD} ${LDFLAGS} '$${SYSTEM_OBJ}' vers.o -o $@; \
+                  ${LD} ${LDFLAGS} ${SYSTEM_OBJ} vers.o -o $@
+SYSTEM_LD_TAIL  = ${SIZE} $@; \
+                  $(OBJCOPY) -O ihex --change-addresses=0x80000000 $@ $(basename $@).hex; \
+                  $(OBJCOPY) -O binary -R .boot -R .config $@ $(basename $@).bin; \
+                  $(OBJDUMP) -d -S $@ > $(basename $@).dis
+
+unix: unix.elf
 
 unix.elf: ${SYSTEM_DEP} swapunix.o
 	${SYSTEM_LD_HEAD}
@@ -132,17 +134,18 @@ unix.elf: ${SYSTEM_DEP} swapunix.o
 swapunix.o: swapunix.c
 	${COMPILE_C}
 
-all: unix.elf
+all: unix
 
 clean:
 	rm -rf .deps *.elf *.o *.map *.dis *.bin machine sys
 
 clean-all: clean
-	rm -f *.h ioconf.c swapunix.c vers.c
+	rm -f *.h *.hex ioconf.c swap*.c vers.c
 
-reconfig ioconf.c swapunix.c: Config ../../../tools/kconfig/kconfig
+reconfig ioconf.c: Config ../../../tools/kconfig/kconfig
 	../../../tools/kconfig/kconfig Config
 	$(MAKE) clean
+	rm -f *.hex
 
 load:   unix.elf
 	pic32prog unix.hex
diff --git a/sys/pic32/wf32/Config b/sys/pic32/wf32/Config
index d6e6826..ba48c29 100644
--- a/sys/pic32/wf32/Config
+++ b/sys/pic32/wf32/Config
@@ -32,7 +32,6 @@ options         "LED_TTY_PIN=1"             # ...use pin RA1
 # Root filesystem at /dev/sd0a, swap at /dev/sd0b
 config          unix    root on sd0a
                         swap on sd0b
-                        dumps on sd0b
 
 # Serial UART ports
 device          uart1                       # Serial-to-USB converter
diff --git a/sys/pic32/wf32/Makefile b/sys/pic32/wf32/Makefile
index de54310..cdf5656 100644
--- a/sys/pic32/wf32/Makefile
+++ b/sys/pic32/wf32/Makefile
@@ -32,7 +32,7 @@ AS              = ${MIPS_GCC_PREFIX}as ${DEBUG} -mips32r2 -EL
 CC              = ${MIPS_GCC_PREFIX}gcc ${DEBUG} -mips32r2 -EL -nostdinc -fno-builtin -Werror -Wall
 CPP             = ${MIPS_GCC_PREFIX}cpp
 LD              = ${MIPS_GCC_PREFIX}gcc -mips32r2 -EL
-LDFLAGS         = -nostdlib -T ../${LDSCRIPT} -Wl,-Map=unix.map
+LDFLAGS         = -nostdlib -T ../${LDSCRIPT} -Wl,-Map=$(basename $@).map
 SIZE            = ${MIPS_GCC_PREFIX}size
 OBJCOPY         = ${MIPS_GCC_PREFIX}objcopy
 OBJDUMP         = ${MIPS_GCC_PREFIX}objdump
@@ -103,14 +103,16 @@ SYSTEM_OBJ      = startup.o ${OBJS} #ioconf.o
 ifeq (devcfg.c,$(wildcard devcfg.c))
     SYSTEM_OBJ  += devcfg.o
 endif
-SYSTEM_DEP      = Makefile ioconf.c swapunix.c machine sys .deps ${SYSTEM_OBJ}
+SYSTEM_DEP      = Makefile ioconf.c machine sys .deps ${SYSTEM_OBJ}
 SYSTEM_LD_HEAD  = sh ../newvers.sh > vers.c; ${CC} $(CFLAGS) -c vers.c; rm -f $@
-SYSTEM_LD       = -@echo ${LD} ${LDFLAGS} '$${SYSTEM_OBJ}' vers.o -o unix.elf; \
-                  ${LD} ${LDFLAGS} ${SYSTEM_OBJ} vers.o -o unix.elf
-SYSTEM_LD_TAIL  = ${SIZE} unix.elf; \
-                  $(OBJCOPY) -O ihex --change-addresses=0x80000000 $@ unix.hex; \
-                  $(OBJCOPY) -O binary -R .boot -R .config $@ unix.bin; \
-                  $(OBJDUMP) -d -S unix.elf > unix.dis
+SYSTEM_LD       = -@echo ${LD} ${LDFLAGS} '$${SYSTEM_OBJ}' vers.o -o $@; \
+                  ${LD} ${LDFLAGS} ${SYSTEM_OBJ} vers.o -o $@
+SYSTEM_LD_TAIL  = ${SIZE} $@; \
+                  $(OBJCOPY) -O ihex --change-addresses=0x80000000 $@ $(basename $@).hex; \
+                  $(OBJCOPY) -O binary -R .boot -R .config $@ $(basename $@).bin; \
+                  $(OBJDUMP) -d -S $@ > $(basename $@).dis
+
+unix: unix.elf
 
 unix.elf: ${SYSTEM_DEP} swapunix.o
 	${SYSTEM_LD_HEAD}
@@ -120,17 +122,18 @@ unix.elf: ${SYSTEM_DEP} swapunix.o
 swapunix.o: swapunix.c
 	${COMPILE_C}
 
-all: unix.elf
+all: unix
 
 clean:
 	rm -rf .deps *.elf *.o *.map *.dis *.bin machine sys
 
 clean-all: clean
-	rm -f *.h ioconf.c swapunix.c vers.c
+	rm -f *.h *.hex ioconf.c swap*.c vers.c
 
-reconfig ioconf.c swapunix.c: Config ../../../tools/kconfig/kconfig
+reconfig ioconf.c: Config ../../../tools/kconfig/kconfig
 	../../../tools/kconfig/kconfig Config
 	$(MAKE) clean
+	rm -f *.hex
 
 load:   unix.elf
 	pic32prog unix.hex
diff --git a/tools/kconfig/mkmakefile.c b/tools/kconfig/mkmakefile.c
index 0b52bab..95b4511 100644
--- a/tools/kconfig/mkmakefile.c
+++ b/tools/kconfig/mkmakefile.c
@@ -397,7 +397,7 @@ void do_load(f)
     fputs("all:", f);
     for (fl = conf_list; fl; fl = fl->f_next)
         if (fl->f_type == SYSTEMSPEC)
-            fprintf(f, " %s.elf", fl->f_needs);
+            fprintf(f, " %s", fl->f_needs);
     putc('\n', f);
 }
 
@@ -508,6 +508,7 @@ do_systemspec(f, fl, first)
     register struct file_list *fl;
     int first;
 {
+    fprintf(f, "%s: %s.elf\n\n", fl->f_needs, fl->f_needs);
 
     fprintf(f, "%s.elf: ${SYSTEM_DEP} swap%s.o", fl->f_needs, fl->f_fn);
     // Don't use newvers target.