diff --git a/openssl.changes b/openssl.changes
index c6876c0..f5c23f8 100644
--- a/openssl.changes
+++ b/openssl.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Feb 22 16:00:16 UTC 2013 - dmueller@suse.com
+
+- disable fstack-protector on aarch64
+
 -------------------------------------------------------------------
 Tue Feb 12 00:08:06 UTC 2013 - hrvoje.senjan@gmail.com
 
diff --git a/openssl.spec b/openssl.spec
index f4a04df..61d3756 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -231,7 +231,7 @@ $RPM_OPT_FLAGS -std=gnu99 \
 -DSSL_FORBID_ENULL \
 -D_GNU_SOURCE \
 $(getconf LFS_CFLAGS) \
-%ifnarch hppa
+%ifnarch hppa aarch64
 -Wall \
 -fstack-protector "
 %else