diff --git a/ChangeLog b/ChangeLog
index 74d6ee83eb52f79a22029a7b836fdc90acc3d7af..284613c42b84203c93125b8db13e2ba20fd2c735 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-11-13  Hans-Peter Nilsson  <hp@axis.com>
+
+	* configure.ac: Add section for configdirs for libsanitizer.
+	Disable for cris-*-* and mmix-*-*.
+	* configure: Regenerate.
+
 2012-11-12  Wei Mi <wmi@google.com>
 
 	* configure.ac: Add libsanitizer to target_libraries.
diff --git a/configure b/configure
index b8b1ebf50d370b1af00e9622e9595f5dadcd072c..c46a2e4fa9f3e85e2c425127412189da1ed0ada6 100755
--- a/configure
+++ b/configure
@@ -3205,6 +3205,13 @@ case "${target}" in
     ;;
 esac
 
+# Disable libsanitizer for some systems.
+case "${target}" in
+  cris-*-* | crisv32-*-* | mmix-*-*)
+    noconfigdirs="$noconfigdirs target-libsanitizer"
+    ;;
+esac
+
 # Disable libssp for some systems.
 case "${target}" in
   avr-*-*)
diff --git a/configure.ac b/configure.ac
index 00d2b6ce5bb74ae869c205d83e5c32642f300ffa..c66aa748b443a69261225ead551d0cb71f3b23c2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -547,6 +547,13 @@ case "${target}" in
     ;;
 esac
 
+# Disable libsanitizer for some systems.
+case "${target}" in
+  cris-*-* | crisv32-*-* | mmix-*-*)
+    noconfigdirs="$noconfigdirs target-libsanitizer"
+    ;;
+esac
+
 # Disable libssp for some systems.
 case "${target}" in
   avr-*-*)