diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8a10a7c017b..ba41000a8a7 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-03  Anatoly Sokolov  <aesok@post.ru>
+
+	* config/avr/avr.h (ASM_OUTPUT_BSS): Remove.
+	(ASM_OUTPUT_ALIGNED_BSS): Define.
+
 2011-04-03  Michael Matz  <matz@suse.de>
 
 	* lto-streamer.h (struct lto_streamer_cache_d): Remove offsets
diff --git a/gcc/config/avr/avr.h b/gcc/config/avr/avr.h
index 854cc45db6e..aaf29dc31c5 100644
--- a/gcc/config/avr/avr.h
+++ b/gcc/config/avr/avr.h
@@ -474,8 +474,8 @@ do {									   \
      fprintf ((STREAM), ",%lu,1\n", (unsigned long)(SIZE));		   \
 } while (0)
 
-#define ASM_OUTPUT_BSS(FILE, DECL, NAME, SIZE, ROUNDED)			\
-  asm_output_bss ((FILE), (DECL), (NAME), (SIZE), (ROUNDED))
+#define ASM_OUTPUT_ALIGNED_BSS(FILE, DECL, NAME, SIZE, ALIGN) \
+  asm_output_aligned_bss (FILE, DECL, NAME, SIZE, ALIGN)
 
 #define ASM_OUTPUT_LOCAL(STREAM, NAME, SIZE, ROUNDED)			\
 do {									\