diff --git a/boost-1.54.0-context-execstack.patch b/boost-1.54.0-context-execstack.patch
index 8bf3eb1..ef721fd 100644
--- a/boost-1.54.0-context-execstack.patch
+++ b/boost-1.54.0-context-execstack.patch
@@ -7,7 +7,7 @@ diff -up boost-1.54.0/libs/context/src/asm/jump_arm_aapcs_elf_gas.S~ boost-1.54.
  .size jump_fcontext,.-jump_fcontext
 +
 +/* Mark that we don't need executable stack.  */
-+.section .note.GNU-stack,"",@progbits
++.section .note.GNU-stack,"",%progbits
 diff -up boost-1.54.0/libs/context/src/asm/jump_i386_sysv_elf_gas.S~ boost-1.54.0/libs/context/src/asm/jump_i386_sysv_elf_gas.S
 --- boost-1.54.0/libs/context/src/asm/jump_i386_sysv_elf_gas.S~	2012-09-18 02:06:47.000000000 -0700
 +++ boost-1.54.0/libs/context/src/asm/jump_i386_sysv_elf_gas.S	2013-07-15 11:10:32.829144835 -0700
@@ -57,7 +57,7 @@ diff -up boost-1.54.0/libs/context/src/asm/make_arm_aapcs_elf_gas.S~ boost-1.54.
  .size make_fcontext,.-make_fcontext
 +
 +/* Mark that we don't need executable stack.  */
-+.section .note.GNU-stack,"",@progbits
++.section .note.GNU-stack,"",%progbits
 diff -up boost-1.54.0/libs/context/src/asm/make_i386_sysv_elf_gas.S~ boost-1.54.0/libs/context/src/asm/make_i386_sysv_elf_gas.S
 --- boost-1.54.0/libs/context/src/asm/make_i386_sysv_elf_gas.S~	2013-06-07 08:38:10.000000000 -0700
 +++ boost-1.54.0/libs/context/src/asm/make_i386_sysv_elf_gas.S	2013-07-15 11:10:40.333185226 -0700
diff --git a/boost.spec b/boost.spec
index 106f319..05bab75 100644
--- a/boost.spec
+++ b/boost.spec
@@ -20,7 +20,7 @@
   %bcond_without openmpi
 %endif
 
-%ifnarch %{ix86} x86_64
+%ifnarch %{ix86} x86_64 %{arm}
   # Avoid using Boost.Context on non-x86 arches.  s390 is not
   # supported at all and there were _syntax errors_ in PPC code.  This
   # should be enabled on a case-by-case basis as the arches are tested
@@ -36,7 +36,7 @@ Name: boost
 Summary: The free peer-reviewed portable C++ source libraries
 Version: 1.54.0
 %define version_enc 1_54_0
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: Boost and MIT and Python
 
 %define toplev_dirname %{name}_%{version_enc}
@@ -1279,6 +1279,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/bjam.1*
 
 %changelog
+* Tue Mar 18 2014 Petr Machata <pmachata@redhat.com> - 1.54.0-14
+- Fix a noexecstack patch for ARM, enable Boost.Context on ARM.
+  (boost-1.54.0-context-execstack.patch)
+
 * Tue Mar 18 2014 Björn Esser <bjoern.esser@gmail.com> - 1.54.0-13
 - rebuilt for mpich-3.1