diff --git a/ChangeLog b/ChangeLog
index 6f7e4e5114f..a25b1726fa6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-09-03  Georg-Johann Lay  <avr@gjlay.de>
+
+	* configure.ac (noconfigdirs,target=avr): Add target-libquadmath.
+	* configure: Regenerate.
+
 2012-08-27  Ulrich Drepper  <drepper@gmail.com>
 
 	* MAINTAINERS: Fix my email address.
diff --git a/configure b/configure
index 60e269e00e5..dba94743ff4 100755
--- a/configure
+++ b/configure
@@ -3153,6 +3153,13 @@ case "${target}" in
     ;;
 esac
 
+# Disable libquadmath for some systems.
+case "${target}" in
+  avr-*-*)
+    noconfigdirs="$noconfigdirs target-libquadmath"
+    ;;
+esac
+
 # Disable libstdc++-v3 for some systems.
 case "${target}" in
   *-*-vxworks*)
diff --git a/configure.ac b/configure.ac
index 27692b45bf8..e3ae26de1d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -544,6 +544,13 @@ case "${target}" in
     ;;
 esac
 
+# Disable libquadmath for some systems.
+case "${target}" in
+  avr-*-*)
+    noconfigdirs="$noconfigdirs target-libquadmath"
+    ;;
+esac
+
 # Disable libstdc++-v3 for some systems.
 case "${target}" in
   *-*-vxworks*)