diff --git a/ChangeLog b/ChangeLog
index e696c6693e..c5b905317b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-04-01  Joseph Myers  <joseph@codesourcery.com>
+
+	* configure.ac (avr-*-*): Add comment about why libssp is disabled.
+	(microblaze*): Don't disable libssp.
+	* configure: Regenerate.
+
 2011-04-01  Joseph Myers  <joseph@codesourcery.com>
 
 	* configure.ac: Remove code setting CONFIG_SHELL, config_shell and
diff --git a/configure b/configure
index fea4aa70e0..7042d24832 100755
--- a/configure
+++ b/configure
@@ -3036,14 +3036,12 @@ fi
 # Disable libssp for some systems.
 case "${target}" in
   avr-*-*)
+    # No hosted I/O support.
     noconfigdirs="$noconfigdirs target-libssp"
     ;;
   powerpc-*-aix* | rs6000-*-aix*)
     noconfigdirs="$noconfigdirs target-libssp"
     ;;
-  microblaze*)
-    noconfigdirs="$noconfigdirs target-libssp"
-    ;;
 esac
 
 # Disable target libiberty for some systems.
diff --git a/configure.ac b/configure.ac
index 2564ce5ad3..e6e91254c4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -483,14 +483,12 @@ fi
 # Disable libssp for some systems.
 case "${target}" in
   avr-*-*)
+    # No hosted I/O support.
     noconfigdirs="$noconfigdirs target-libssp"
     ;;
   powerpc-*-aix* | rs6000-*-aix*)
     noconfigdirs="$noconfigdirs target-libssp"
     ;;
-  microblaze*)
-    noconfigdirs="$noconfigdirs target-libssp"
-    ;;
 esac
 
 # Disable target libiberty for some systems.