diff --git a/etc/fstab b/etc/fstab
index 38305c1..c05ce43 100644
--- a/etc/fstab
+++ b/etc/fstab
@@ -1,2 +1,2 @@
-/dev/rd0a	/	ufs	rw,async	1	1
-#/dev/rd0c	/u	ufs	rw,async	1	2
+/dev/sd0a	/	ufs	rw,async	1	1
+#/dev/sd0c	/u	ufs	rw,async	1	2
diff --git a/rootfs.manifest b/rootfs.manifest
index a0121c1..6af5da5 100644
--- a/rootfs.manifest
+++ b/rootfs.manifest
@@ -22,66 +22,36 @@ dir /u
 #
 # Block devices.
 #
-bdev /dev/rd0
+bdev /dev/sd0
 major 0
 minor 0
-bdev /dev/rd0a
+bdev /dev/sd0a
 major 0
 minor 1
-bdev /dev/rd0b
+bdev /dev/sd0b
 major 0
 minor 2
-bdev /dev/rd0c
+bdev /dev/sd0c
 major 0
 minor 3
-bdev /dev/rd0d
+bdev /dev/sd0d
 major 0
 minor 4
-bdev /dev/rd1
-major 1
-minor 0
-bdev /dev/rd1a
-major 1
-minor 1
-bdev /dev/rd1b
-major 1
-minor 2
-bdev /dev/rd1c
-major 1
-minor 3
-bdev /dev/rd1d
-major 1
-minor 4
-bdev /dev/rd2
-major 2
-minor 0
-bdev /dev/rd2a
-major 2
-minor 1
-bdev /dev/rd2b
-major 2
-minor 2
-bdev /dev/rd2c
-major 2
-minor 3
-bdev /dev/rd2d
-major 2
-minor 4
-bdev /dev/rd3
-major 3
-minor 0
-bdev /dev/rd3a
-major 3
-minor 1
-bdev /dev/rd3b
-major 3
-minor 2
-bdev /dev/rd3c
-major 3
-minor 3
-bdev /dev/rd3d
-major 3
-minor 4
+bdev /dev/sd1
+major 0
+minor 8
+bdev /dev/sd1a
+major 0
+minor 9
+bdev /dev/sd1b
+major 0
+minor 10
+bdev /dev/sd1c
+major 0
+minor 11
+bdev /dev/sd1d
+major 0
+minor 12
 bdev /dev/swap
 major 4
 minor 64
diff --git a/sys/pic32/devsw.c b/sys/pic32/devsw.c
index bee323e..e0b35a3 100644
--- a/sys/pic32/devsw.c
+++ b/sys/pic32/devsw.c
@@ -103,7 +103,7 @@ daddr_t nosize(dev)
  * devices must be numbered from master 0 upwards.
  */
 const struct bdevsw bdevsw[] = {
-{   /* 0 - rd0 */
+{   /* 0 - sd */
 #ifdef SD_ENABLED
     sdopen,         sdclose,        sdstrategy,
     sdsize,         sdioctl,        sddevs
diff --git a/sys/pic32/rd_flash.c b/sys/pic32/rd_flash.c
deleted file mode 100644
index d3eef65..0000000
--- a/sys/pic32/rd_flash.c
+++ /dev/null
@@ -1,56 +0,0 @@
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/buf.h>
-#include <sys/errno.h>
-#include <sys/dk.h>
-#include <sys/debug.h>
-
-extern unsigned char flash_data[]      asm("_binary_flash_img_start");
-extern unsigned char flash_data_size[] asm("_binary_flash_img_size");
-extern unsigned char flash_data_end[]  asm("_binary_flash_img_end");
-
-/*
- * Query disk size, for swapping.
- */
-daddr_t flash_size(int unit)
-{
-    size_t fsize = (size_t)((void *)flash_data_size)>>10;
-
-
-    DEBUG3("flash%d: %u kbytes\n", unit, fsize);
-    return fsize;
-}
-
-int flash_open (int unit, int flag, int mode)
-{
-    if (unit > 0)
-        return ENXIO;
-    return 0;
-}
-
-int flash_read(int unit, unsigned int offset, char *buf, unsigned int bcount)
-{
-    unsigned int i;
-    if(unit>0)
-        return ENXIO;
-
-    offset = offset<<10;
-    if(!buf)
-        return 0;
-
-    for(i=0; i<bcount; i++)
-        buf[i] = flash_data[offset+i];
-
-    return 0;
-}
-
-int flash_write(int unit, unsigned int offset, char *buf, unsigned int bcount)
-{
-    return 0;
-}
-
-void flash_init(int unit, int flag)
-{
-    if(!(flag & S_SILENT)) printf("flash%d: %d bytes\n",unit,flash_size(unit)*1024);
-    flash_read(0,69,NULL,512);
-}