diff --git a/ChangeLog b/ChangeLog
index 5de77b4571472ae0342043cecc94620a0cdc21c2..bb42398dedeb8d7e2a3a1a73d6a88f585b15629c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-13  Dodji Seketeli  <dodji@redhat.com>
+
+	* configure.ac: Enable libsanitizer just on x86 linux for now.
+	* configure: Re-generate.
+
 2012-11-13  David Edelsohn  <dje.gcc@gmail.com>
 
 	* configure.ac: Disable libsanitizer on AIX. Merge libquadmath
diff --git a/configure b/configure
index c387e9258d42dc291f38603ae7ab7b4e6c2dae9e..39df09f3d8f922a326bd3a18444642937032fcd6 100755
--- a/configure
+++ b/configure
@@ -3208,12 +3208,11 @@ case "${target}" in
     ;;
 esac
 
-# Disable libsanitizer for some systems.
+# Disable libsanitizer on all systems but x86 linux for now.
 case "${target}" in
-  cris-*-* | crisv32-*-* | mmix-*-*)
-    noconfigdirs="$noconfigdirs target-libsanitizer"
+  x86_64-*-linux-* | i?86-*-linux-*)
     ;;
-  powerpc-*-aix* | rs6000-*-aix*)
+  *)
     noconfigdirs="$noconfigdirs target-libsanitizer"
     ;;
 esac
diff --git a/configure.ac b/configure.ac
index 1d958b4c20348a687e45bb6607678ea711a80698..6c1b008b6169a07e3b3e0a2350c6bf64845aa744 100644
--- a/configure.ac
+++ b/configure.ac
@@ -550,12 +550,11 @@ case "${target}" in
     ;;
 esac
 
-# Disable libsanitizer for some systems.
+# Disable libsanitizer on all systems but x86 linux for now.
 case "${target}" in
-  cris-*-* | crisv32-*-* | mmix-*-*)
-    noconfigdirs="$noconfigdirs target-libsanitizer"
+  x86_64-*-linux-* | i?86-*-linux-*)
     ;;
-  powerpc-*-aix* | rs6000-*-aix*)
+  *)
     noconfigdirs="$noconfigdirs target-libsanitizer"
     ;;
 esac