diff --git a/sim/testsuite/.Sanitize b/sim/testsuite/.Sanitize
index 78f9367291..4164e3afd0 100644
--- a/sim/testsuite/.Sanitize
+++ b/sim/testsuite/.Sanitize
@@ -22,6 +22,13 @@ else
         lose_these_too="${d30v_files} ${lose_these_too}"
 fi
 
+r5900_files="mips64r5900el-elf"
+if ( echo $* | grep keep\-r5900 > /dev/null ) ; then
+        keep_these_too="${r5900_files} ${keep_these_too}"
+else
+        lose_these_too="${r5900_files} ${lose_these_too}"
+fi
+
 # All files listed between the "Things-to-keep:" line and the
 # "Files-to-sed:" line will be kept.  All other files will be removed.
 # Directories listed in this section will have their own Sanitize
@@ -39,7 +46,6 @@ Things-to-lose:
 
 common
 tic80-coff
-mips64vr5900el-elf
 
 Do-last:
 
@@ -71,6 +77,34 @@ else
         done
 fi
 
+r5900_files="configure configure.in ChangeLog Makefile.in"
+if ( echo $* | grep keep\-r5900 > /dev/null ) ; then
+        for i in $r5900_files ; do
+                if test ! -d $i && (grep sanitize-r5900 $i > /dev/null) ; then
+                        if [ -n "${verbose}" ] ; then
+                                echo Keeping r5900 stuff in $i
+                        fi
+                fi
+        done
+else
+        for i in $r5900_files ; do
+                if test ! -d $i && (grep sanitize-r5900 $i > /dev/null) ; then
+                        if [ -n "${verbose}" ] ; then
+                                echo Removing traces of \"r5900\" from $i...
+                        fi
+                        cp $i new
+                        sed '/start\-sanitize\-r5900/,/end-\sanitize\-r5900/d' < $i > new
+                        if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
+                                if [ -n "${verbose}" ] ; then
+                                        echo Caching $i in .Recover...
+                                fi
+                                mv $i .Recover
+                        fi
+                        mv new $i
+                fi
+        done
+fi
+
 for i in * ; do
         if test ! -d $i && (grep sanitize $i > /dev/null) ; then
                 echo '***' Some mentions of Sanitize are still left in $i! 1>&2
diff --git a/sim/testsuite/configure.in b/sim/testsuite/configure.in
index ea0740b22c..37371bd873 100644
--- a/sim/testsuite/configure.in
+++ b/sim/testsuite/configure.in
@@ -22,6 +22,9 @@ case "${target}" in
 # start-sanitize-d30v
 	d30v-*-elf)		configdirs="${configdirs} d30v-elf" ;;
 # end-sanitize-d30v
+# start-sanitize-r5900
+	mips64vr5900el-*-elf)	configdirs="${configdirs} mips64vr5900el-elf" ;;
+# end-sanitize-r5900
 	*)		;;
 esac