diff --git a/ChangeLog b/ChangeLog
index 74d6ee83eb5..284613c42b8 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 b8b1ebf50d3..c46a2e4fa9f 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 00d2b6ce5bb..c66aa748b44 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-*-*)