diff --git a/tools/tools/nanobsd/rescue/R32 b/tools/tools/nanobsd/rescue/R32
deleted file mode 100644
index 3c15ebee49e7..000000000000
--- a/tools/tools/nanobsd/rescue/R32
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# R32 -- Generic kernel configuration file with modifications for rescue.
-#
-# $FreeBSD$
-
-include GENERIC
-
-ident	R32
-
-nooptions	INVARIANTS
-nooptions	INVARIANT_SUPPORT
-nooptions	WITNESS
-nooptions	WITNESS_SKIPSPIN
-nooptions	MALLOC_DEBUG_MAXZONES
diff --git a/tools/tools/nanobsd/rescue/build.sh b/tools/tools/nanobsd/rescue/build.sh
index 7d2ed80cd265..0c7026c868f9 100755
--- a/tools/tools/nanobsd/rescue/build.sh
+++ b/tools/tools/nanobsd/rescue/build.sh
@@ -1,45 +1,37 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 today=`date '+%Y%m%d'`
 
 if [ -z "${1}" -o \! -f "${1}" ]; then
   echo "Usage: $0 cfg_file [-bhiknw]"
   echo "-i : skip image build"
   echo "-w : skip buildworld step"
   echo "-k : skip buildkernel step"
   echo "-b : skip buildworld and buildkernel step"
   exit
 fi
 
 CFG="${1}"
 shift;
 
 if [ \! -d /usr/obj/Rescue ]; then
   mkdir -p /usr/obj/Rescue
 fi
 
 sh ../nanobsd.sh $* -c ${CFG}
 
 if [ \! -d /usr/obj/Rescue ]; then
   mkdir -p /usr/obj/Rescue
 fi
-F32="/usr/obj/Rescue/rescue_${today}_x32"
-D32="/usr/obj/nanobsd.rescue_i386"
-if [ -f "${D32}/_.disk.full" ]; then
-  cp "${D32}/_.disk.full" "${F32}.img"
-fi
-if [ -f "${D32}/_.disk.iso" ]; then
-  cp "${D32}/_.disk.iso" "${F32}.iso"
-fi
 
 F64="/usr/obj/Rescue/rescue_${today}_x64"
 D64="/usr/obj/nanobsd.rescue_amd64"
 if [ -f "${D64}/_.disk.full" ]; then
   cp "${D64}/_.disk.full" "${F64}.img"
 fi
 if [ -f "${D64}/_.disk.iso" ]; then
   cp "${D64}/_.disk.iso" "${F64}.iso"
 fi
diff --git a/tools/tools/nanobsd/rescue/merge.sh b/tools/tools/nanobsd/rescue/merge.sh
deleted file mode 100755
index afb66371fe3c..000000000000
--- a/tools/tools/nanobsd/rescue/merge.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-today=`date '+%Y%m%d'`
-
-I32="/usr/obj/Rescue/rescue_${today}_x32.img"
-I64="/usr/obj/Rescue/rescue_${today}_x64.img"
-IAL="/usr/obj/Rescue/rescue_${today}_xal.img"
-D64="/usr/obj/nanobsd.rescue_amd64"
-MNT="/usr/obj/Rescue/_mnt"
-
-if [ \! -d "$MNT" ]; then
-  mkdir "$MNT"
-fi
-
-dd if=${I32} of=${IAL} bs=128k
-MD=`mdconfig -a -t vnode -f ${IAL}`
-
-dd if=${D64}/_.disk.image of=/dev/${MD}s2 bs=128k
-tunefs -L rescues2a /dev/${MD}s2a
-mount /dev/${MD}s2a ${MNT}
-
-sed -i "" -e 's/rescues1/rescues2/' ${MNT}/conf/base/etc/fstab
-sed -i "" -e 's/rescues1/rescues2/' ${MNT}/etc/fstab
-
-umount ${MNT}
-
-mdconfig -d -u ${MD}
diff --git a/tools/tools/nanobsd/rescue/rescue_i386.conf b/tools/tools/nanobsd/rescue/rescue_i386.conf
deleted file mode 100644
index 97b51d49e21d..000000000000
--- a/tools/tools/nanobsd/rescue/rescue_i386.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# $FreeBSD$
-#
-NANO_KERNEL=R32
-NANO_ARCH=i386
-TARGET_ARCH=i386; export TARGET_ARCH
-#TARGET_CPUTYPE=i386; export TARGET_CPUTYPE
-NANO_NAME=rescue_i386
-
-. common