diff --git a/ChangeLog b/ChangeLog
index 87559f36f79d304addfb0bfa4558d731c6f10e11..6c0d6d60399d22497e81e63278db323491c07e3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-27  Siddhesh Poyarekar  <siddhesh@redhat.com>
+
+	* configure.ac: Disable libsanitizer if we're not building C++.
+	* configure: Regenerate.
+
 2012-11-15  Roland McGrath  <roland@hack.frob.com>
 
 	* MAINTAINERS (Write After Approval): Add myself.
diff --git a/configure b/configure
index d72d4f93f9c5002df0c6796ef41b5ffcb94c7c5d..16bbaa82bedf3950e9c2fdc1f8d6aac3f2ad7a3e 100755
--- a/configure
+++ b/configure
@@ -6437,11 +6437,11 @@ case ,${enable_languages},:${enable_objc_gc} in
     ;;
 esac
 
-# Disable libitm if we're not building C++
+# Disable libitm and libsanitizer if we're not building C++
 case ,${enable_languages}, in
   *,c++,*) ;;
   *)
-    noconfigdirs="$noconfigdirs target-libitm"
+    noconfigdirs="$noconfigdirs target-libitm target-libsanitizer"
     ;;
 esac
 
diff --git a/configure.ac b/configure.ac
index 24ea7e526a3ff6b16d7d483ce84a24b848368586..cd6721e45945e492a9f4dd0e78f593012c19122d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2008,11 +2008,11 @@ case ,${enable_languages},:${enable_objc_gc} in
     ;;
 esac
 
-# Disable libitm if we're not building C++
+# Disable libitm and libsanitizer if we're not building C++
 case ,${enable_languages}, in
   *,c++,*) ;;
   *)
-    noconfigdirs="$noconfigdirs target-libitm"
+    noconfigdirs="$noconfigdirs target-libitm target-libsanitizer"
     ;;
 esac