diff --git a/ld/.Sanitize b/ld/.Sanitize
index 3ef50a7812..b01e83ee57 100644
--- a/ld/.Sanitize
+++ b/ld/.Sanitize
@@ -106,4 +106,40 @@ else
 	done
 fi
 
+r16_files = "configure.in"
+
+if ( echo $* | grep keep\-r16 > /dev/null ) ; then
+	for i in $r16_files ; do
+		if test ! -d $i && (grep sanitize-r16 $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Keeping r16 stuff in $i
+			fi
+		fi
+	done
+else
+	for i in $r16_files ; do
+		if test ! -d $i && (grep sanitize-r16 $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Removing traces of \"r16\" from $i...
+			fi
+			cp $i new
+			sed '/start\-sanitize\-r16/,/end-\sanitize\-r16/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
+	fi
+done
+
+#
 # End of file.
diff --git a/ld/configure.in b/ld/configure.in
index 1d1c73cb03..00fef3321f 100644
--- a/ld/configure.in
+++ b/ld/configure.in
@@ -89,12 +89,16 @@ case "${targ}" in
   h8300h-*-hms)		ld_target=cf-h8300h ;;
   h8500-*-hms)		ld_target=coff-h8500 ;;
   sh-*-*)		ld_target=coff-sh ;;
+# start-sanitize-r16
+  r16-*-*)		ld_target=r16-aout ;;
+# end-sanitize-r16
   m68k-sony-*)		ld_target=news ;;
   m68k-hp-bsd*)		ld_target=hp300bsd ;;
   m68*-*-aout)		ld_target=m68k ;;
   m68*-*-coff)		ld_target=m68k-coff ;;
   m68*-*-hpux*)		ld_target=hp300hpux ;;
   m68*-*-lynxos*)	ld_target=m68k-lynx ;;
+  m68*-*-netbsd*)	ld_target=m68k-nbsd ;;
   m68*-*-*)
     echo '***' "Unknown m68k target vendor for ld:" ${target_vendor} 1>&2
 			exit 1 ;;