diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ea4f385f5d78..7c58eb5617de 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-01  Tristan Gingold  <gingold@adacore.com>
+
+	* configure.ac: Define the nop insn for avr*-*-*
+	* configure: Regenerate.
+
 2010-10-01  Alan Modra  <amodra@gmail.com>
 
 	PR target/45807
diff --git a/gcc/configure b/gcc/configure
index 80b93620083e..e2c0a138bc0c 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -24491,7 +24491,7 @@ esac
 # version to the per-target configury.
 case "$target" in
   i?86*-*-* | mips*-*-* | alpha*-*-* | powerpc*-*-* | sparc*-*-* | m68*-*-* \
-  | x86_64*-*-* | hppa*-*-* | arm*-*-* \
+  | x86_64*-*-* | hppa*-*-* | arm*-*-* | avr*-*-* \
   | xstormy16*-*-* | cris-*-* | crisv32-*-* | xtensa*-*-* | bfin-*-* | score*-*-* \
   | spu-*-* | fido*-*-* | m32c-*-* | microblaze-*-*)
     insn="nop"
diff --git a/gcc/configure.ac b/gcc/configure.ac
index 65ae072fe443..14690d3c01cd 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -3752,7 +3752,7 @@ esac
 # version to the per-target configury.
 case "$target" in
   i?86*-*-* | mips*-*-* | alpha*-*-* | powerpc*-*-* | sparc*-*-* | m68*-*-* \
-  | x86_64*-*-* | hppa*-*-* | arm*-*-* \
+  | x86_64*-*-* | hppa*-*-* | arm*-*-* | avr*-*-* \
   | xstormy16*-*-* | cris-*-* | crisv32-*-* | xtensa*-*-* | bfin-*-* | score*-*-* \
   | spu-*-* | fido*-*-* | m32c-*-* | microblaze-*-*)
     insn="nop"