diff --git a/.Sanitize b/.Sanitize
index 58dd5ad85ae..932dd4b31ae 100644
--- a/.Sanitize
+++ b/.Sanitize
@@ -172,6 +172,39 @@ else
 	done
 fi
 
+if [ -n "${verbose}" ] ; then
+	echo Processing \"arc\"...
+fi
+
+# Don't try to clean directories here, as the 'mv' command will fail.
+# Also, grep fails on NFS mounted directories.
+if ( echo $* | grep keep\-arc > /dev/null ) ; then
+	for i in * ; do
+		if test ! -d $i && (grep sanitize-arc $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Keeping arc stuff in $i
+			fi
+		fi
+	done
+else
+	for i in * ; do
+		if test ! -d $i && (grep sanitize-arc $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Removing traces of \"arc\" from $i...
+			fi
+			cp $i new
+			sed '/start\-sanitize\-arc/,/end-\sanitize\-arc/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