diff --git a/ChangeLog b/ChangeLog
index 553690f0af0..df848735062 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-11  Eric B. Weddington  <eweddington@cso.atmel.com>
+
+	* configure.ac: Do not build libssp for the AVR.
+	* configure: Regenerate.
+
 2008-04-07  Ian Lance Taylor  <iant@google.com>
 
 	* Makefile.def: check-gold depends upon all-binutils.
diff --git a/configure b/configure
index b146180397e..0ab798c9aa5 100755
--- a/configure
+++ b/configure
@@ -2326,7 +2326,7 @@ case "${target}" in
     noconfigdirs="$noconfigdirs ld target-libgloss ${libgcj}"
     ;;
   avr-*-*)
-    noconfigdirs="$noconfigdirs target-libiberty target-libstdc++-v3 ${libgcj}"
+    noconfigdirs="$noconfigdirs target-libiberty target-libstdc++-v3 ${libgcj} target-libssp"
     ;;
   bfin-*-*)
     noconfigdirs="$noconfigdirs gdb"
diff --git a/configure.ac b/configure.ac
index 1a18c61ece9..f47be29cb8c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -588,7 +588,7 @@ case "${target}" in
     noconfigdirs="$noconfigdirs ld target-libgloss ${libgcj}"
     ;;
   avr-*-*)
-    noconfigdirs="$noconfigdirs target-libiberty target-libstdc++-v3 ${libgcj}"
+    noconfigdirs="$noconfigdirs target-libiberty target-libstdc++-v3 ${libgcj} target-libssp"
     ;;
   bfin-*-*)
     noconfigdirs="$noconfigdirs gdb"