diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a0817e8a449..55561a109ad 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-18  Andy Hutchinson  <hutchinsonandy@aim.com>
+
+	PR c/36571
+	* gcc.dg/builtin-return-1.c: Mark as xfail on AVR.
+	
 2008-06-18  Andy Hutchinson  <hutchinsonandy@aim.com>
 
 	* gcc.dg/tree-ssa/loop-35.c: xfail avr target. Add new avr specific 
diff --git a/gcc/testsuite/gcc.dg/builtin-return-1.c b/gcc/testsuite/gcc.dg/builtin-return-1.c
index 75c9acdf72a..68fd0556b3d 100644
--- a/gcc/testsuite/gcc.dg/builtin-return-1.c
+++ b/gcc/testsuite/gcc.dg/builtin-return-1.c
@@ -1,7 +1,7 @@
 /* PR middle-end/11151 */
 /* Originator: Andrew Church <gcczilla@achurch.org> */
 /* { dg-do run } */
-
+/* { dg-xfail-run-if "PR36571 untyped return is char register" { "avr-*-*" } { "*" } { "" } } */
 /* This used to fail on SPARC because the (undefined) return
    value of 'bar' was overwriting that of 'foo'.  */