diff --git a/gc.changes b/gc.changes
index a48a193..903116f 100644
--- a/gc.changes
+++ b/gc.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat May 25 19:16:48 UTC 2013 - root@localhost
+
+- libatomic_ops-aarch64.patch: update makefile to install missing headers,
+  don't use AO_EXPECT_FALSE.
+
 -------------------------------------------------------------------
 Sat May 18 08:10:09 UTC 2013 - schwab@suse.de
 
diff --git a/libatomic_ops-aarch64.patch b/libatomic_ops-aarch64.patch
index a3db085..308ac0b 100644
--- a/libatomic_ops-aarch64.patch
+++ b/libatomic_ops-aarch64.patch
@@ -17,11 +17,12 @@ Index: libatomic_ops/src/atomic_ops/sysdeps/Makefile.am
 ===================================================================
 --- libatomic_ops/src/atomic_ops/sysdeps/Makefile.am.orig
 +++ libatomic_ops/src/atomic_ops/sysdeps/Makefile.am
-@@ -30,6 +30,7 @@ nobase_sysdep_HEADERS= generic_pthread.h
+@@ -30,6 +30,8 @@ nobase_sysdep_HEADERS= generic_pthread.h
  	  gcc/hexagon.h gcc/hppa.h gcc/ia64.h gcc/m68k.h \
  	  gcc/mips.h gcc/powerpc.h gcc/s390.h \
  	  gcc/sh.h gcc/sparc.h gcc/x86.h gcc/x86_64.h \
-+	  gcc/aarch64.h gcc/generic.h
++	  gcc/aarch64.h gcc/generic.h \
++	  gcc/generic-small.h gcc/generic-arithm.h \
  	\
  	  hpc/hppa.h hpc/ia64.h \
  	\
@@ -77,7 +78,7 @@ Index: libatomic_ops/src/atomic_ops/sysdeps/gcc/aarch64.h
 +      "       stxp %w2, %0, %1, %3"
 +      : "=&r" (result.AO_val1), "=&r" (result.AO_val2), "=&r" (status)
 +      : "Q" (*addr));
-+    } while (AO_EXPECT_FALSE(status));
++    } while (status);
 +    return result;
 +  }
 +# define AO_HAVE_double_load
@@ -94,7 +95,7 @@ Index: libatomic_ops/src/atomic_ops/sysdeps/gcc/aarch64.h
 +      "       stxp %w2, %0, %1, %3"
 +      : "=&r" (result.AO_val1), "=&r" (result.AO_val2), "=&r" (status)
 +      : "Q" (*addr));
-+    } while (AO_EXPECT_FALSE(status));
++    } while (status);
 +    return result;
 +  }
 +# define AO_HAVE_double_load_acquire
@@ -114,7 +115,7 @@ Index: libatomic_ops/src/atomic_ops/sysdeps/gcc/aarch64.h
 +      : "r" (value.AO_val1), "r" (value.AO_val2));
 +      /* Compared to the arm.h implementation, the 'cc' (flags) are not */
 +      /* clobbered because A64 has no concept of conditional execution. */
-+    } while (AO_EXPECT_FALSE(status));
++    } while (status);
 +  }
 +# define AO_HAVE_double_store
 +
@@ -131,7 +132,7 @@ Index: libatomic_ops/src/atomic_ops/sysdeps/gcc/aarch64.h
 +      : "=&r" (old_val.AO_val1), "=&r" (old_val.AO_val2), "=&r" (status),
 +        "=Q" (*addr)
 +      : "r" (value.AO_val1), "r" (value.AO_val2));
-+    } while (AO_EXPECT_FALSE(status));
++    } while (status);
 +  }
 +# define AO_HAVE_double_store_release
 +
@@ -153,7 +154,7 @@ Index: libatomic_ops/src/atomic_ops/sysdeps/gcc/aarch64.h
 +        "       stxp %w0, %2, %3, %1\n"
 +        : "=&r" (result), "=Q" (*addr)
 +        : "r" (new_val.AO_val1), "r" (new_val.AO_val2));
-+    } while (AO_EXPECT_FALSE(result));
++    } while (result);
 +    return !result;
 +  }
 +# define AO_HAVE_double_compare_and_swap
@@ -176,7 +177,7 @@ Index: libatomic_ops/src/atomic_ops/sysdeps/gcc/aarch64.h
 +        "       stxp %w0, %2, %3, %1\n"
 +        : "=&r" (result), "=Q" (*addr)
 +        : "r" (new_val.AO_val1), "r" (new_val.AO_val2));
-+    } while (AO_EXPECT_FALSE(result));
++    } while (result);
 +    return !result;
 +  }
 +# define AO_HAVE_double_compare_and_swap_acquire
@@ -199,7 +200,7 @@ Index: libatomic_ops/src/atomic_ops/sysdeps/gcc/aarch64.h
 +        "       stlxp %w0, %2, %3, %1\n"
 +        : "=&r" (result), "=Q" (*addr)
 +        : "r" (new_val.AO_val1), "r" (new_val.AO_val2));
-+    } while (AO_EXPECT_FALSE(result));
++    } while (result);
 +    return !result;
 +  }
 +# define AO_HAVE_double_compare_and_swap_release