diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index fec04f0b7..3a5d0d662 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,10 @@
+2006-03-22  Mark Mitchell  <mark@codesourcery.com>
+
+	* configure.host: Allow hosts to set the default
+	newlib_atexit_dynamic_alloc value.
+	* configure.in: Likewise.
+	* configure: Regenerated.
+
 2006-03-20  Mark Mitchell  <mark@codesourcery.com>
 
 	* acconfig.h (_ATEXIT_DYNAMIC_ALLOC): Undef.
diff --git a/newlib/configure b/newlib/configure
index ce9246a31..e3004c3ef 100755
--- a/newlib/configure
+++ b/newlib/configure
@@ -705,7 +705,7 @@ if test "${enable_newlib_atexit_dynamic_alloc+set}" = set; then
   esac
  fi
 else
-  newlib_atexit_dynamic_alloc=yes
+  newlib_atexit_dynamic_alloc=${newlib_atexit_dynamic_alloc}
 fi
 
 am__api_version="1.4"
diff --git a/newlib/configure.host b/newlib/configure.host
index d85e8ad2c..759c38adb 100644
--- a/newlib/configure.host
+++ b/newlib/configure.host
@@ -63,6 +63,7 @@ have_sys_mach_dir=no
 default_newlib_io_long_long=no
 default_newlib_io_long_double=no
 default_newlib_io_pos_args=no
+default_newlib_atexit_dynamic_alloc=yes
 aext=a
 oext=o
 
@@ -738,6 +739,13 @@ if [ "x${newlib_io_pos_args}" = "x" ]; then
 	fi
 fi
 
+# Disable atexit dynamic allocation if requested.
+if [ "x${newlib_atexit_dynamic_alloc}" = "x" ]; then
+	if [ ${default_newlib_atexit_dynamic_alloc} = "yes" ]; then
+		newlib_atexit_dynamic_alloc="yes"; 
+	fi
+fi
+
 if test -z "${have_crt0}" && test -n "${sys_dir}"; then
   have_crt0="yes"
 fi
diff --git a/newlib/configure.in b/newlib/configure.in
index c8dc21176..3cd213c6f 100644
--- a/newlib/configure.in
+++ b/newlib/configure.in
@@ -94,7 +94,7 @@ AC_ARG_ENABLE(newlib-atexit-dynamic-alloc,
     no)  newlib_atexit_dynamic_alloc=no  ;;
     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-atexit-dynamic-alloc option) ;;
   esac
- fi], [newlib_atexit_dynamic_alloc=yes])dnl
+ fi], [newlib_atexit_dynamic_alloc=${newlib_atexit_dynamic_alloc}])dnl
 
 NEWLIB_CONFIGURE(.)