diff --git a/.Sanitize b/.Sanitize
index d44716570c..13cec5ed9c 100644
--- a/.Sanitize
+++ b/.Sanitize
@@ -179,6 +179,32 @@ else
 	done
 fi
 
+if ( echo $* | grep for\-fsf > /dev/null ) ; then
+	if [ -n "${verbose}" ]; then
+		echo Cleaning up configure.in for FSF release...
+	fi
+	sed '/start\-sanitize\-for\-fsf/,/end\-sanitize\-for\-fsf/d' < configure.in > new
+	if [ -n "${safe}" -a ! -f .Recover/$i ]; then
+		if [ -n "${verbose}" ]; then
+			echo Caching configure.in in .Recover...
+		fi
+		mv configure.in .Recover
+	fi
+	mv new configure.in
+else
+	if [ -n "${verbose}" ]; then
+		echo Removing sanitize-for-fsf markers from configure.in...
+	fi
+	grep -v sanitize-for-fsf < configure.in > new
+	if [ -n "${safe}" ]; then
+		if [ -n "${verbose}" ]; then
+			echo Caching configure.in in .Recover...
+		fi
+		mv configure.in .Recover
+	fi
+	mv new configure.in
+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/configure.in b/configure.in
index 5a453a7f96..08d8104ffc 100644
--- a/configure.in
+++ b/configure.in
@@ -137,7 +137,7 @@ esac
 
 
 
-# some tools are only suitable for building in a "native" situation.
+# Some tools are only suitable for building in a "native" situation.
 # Those are added when we have a host==target configuration.  For cross
 # toolchains, we add some directories that should only be useful in a
 # cross-compiler.
@@ -156,10 +156,13 @@ else
 	done
 fi	
 
+## start-sanitize-for-fsf
 
-# remove more programs from consideration, based on the host or 
+# Remove more programs from consideration, based on the host or 
 # target this usually means that a port of the program doesn't
-# exist yet.
+# exist yet.  This section gets removed for FSF releases,
+# where we want the configure scripts in the subdirectories to
+# complain if the target or host isn't supported.
 
 case "${host}" in
   alpha-dec-osf1)
@@ -230,6 +233,8 @@ case "${target}" in
     ;;
 esac
 
+## end-sanitize-for-fsf
+
 # Set with_gnu_as and with_gnu_ld as appropriate.
 #
 # This is done by determining whether or not the appropriate directory