diff --git a/0001-Changes-required-for-aarch64-support-in-boost-config.patch b/0001-Changes-required-for-aarch64-support-in-boost-config.patch
new file mode 100644
index 0000000..5003a58
--- /dev/null
+++ b/0001-Changes-required-for-aarch64-support-in-boost-config.patch
@@ -0,0 +1,26 @@
+From 8787f6b0718b6b0750869ba52bc65d26db665a05 Mon Sep 17 00:00:00 2001
+From: Ananth Jasty <ajasty@cavium.com>
+Date: Wed, 15 Apr 2015 17:59:47 -0700
+Subject: [PATCH] Changes required for aarch64 support in boost::config.
+
+---
+ libs/config/checks/architecture/arm.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/libs/config/checks/architecture/arm.cpp b/libs/config/checks/architecture/arm.cpp
+index 6a83737..794aba8 100644
+--- a/libs/config/checks/architecture/arm.cpp
++++ b/libs/config/checks/architecture/arm.cpp
+@@ -8,6 +8,8 @@
+ 
+ #if !defined(__arm__) && !defined(__thumb__) && \
+     !defined(__TARGET_ARCH_ARM) && !defined(__TARGET_ARCH_THUMB) && \
+-    !defined(_ARM) && !defined(_M_ARM)
++    !defined(_ARM) && !defined(_M_ARM) && \
++    !defined(__aarch64__) 
+ #error "Not ARM"
+ #endif
++
+-- 
+2.4.5
+
diff --git a/boost-context-use-sysv-not-aapcs.patch b/boost-context-use-sysv-not-aapcs.patch
deleted file mode 100644
index 11d988e..0000000
--- a/boost-context-use-sysv-not-aapcs.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-http://lists.boost.org/Archives/boost/2015/02/220155.php
-
-commit d19baee73f90de01375af69a9f8621799c649964
-Author: Edward Nevill <edward.nevill_at_[hidden]>
-Date: Mon Feb 23 17:32:49 2015 +0000
-
-    Fix build for aarch64.
-
-
-Index: boost_1_57_0/libs/context/build/Jamfile.v2
-===================================================================
---- boost_1_57_0.orig/libs/context/build/Jamfile.v2
-+++ boost_1_57_0/libs/context/build/Jamfile.v2
-@@ -214,7 +214,7 @@ alias asm_context_sources
- alias asm_context_sources
-    : [ make asm/make_arm64_aapcs_elf_gas.o : asm/make_arm64_aapcs_elf_gas.S : @gas64 ]
-      [ make asm/jump_arm64_aapcs_elf_gas.o : asm/jump_arm64_aapcs_elf_gas.S : @gas64 ]
--   : <abi>aapcs
-+   : <abi>sysv
-      <address-model>64
-      <architecture>arm
-      <binary-format>elf
-@@ -223,7 +223,7 @@ alias asm_context_sources
- alias asm_context_sources
-    : asm/make_arm64_aapcs_elf_gas.S
-      asm/jump_arm64_aapcs_elf_gas.S
--   : <abi>aapcs
-+   : <abi>sysv
-      <address-model>64
-      <architecture>arm
-      <binary-format>elf
-@@ -233,7 +233,7 @@ alias asm_context_sources
- alias asm_context_sources
-    : asm/make_arm64_aapcs_elf_gas.S
-      asm/jump_arm64_aapcs_elf_gas.S
--   : <abi>aapcs
-+   : <abi>sysv
-      <address-model>64
-      <architecture>arm
-      <binary-format>elf
diff --git a/boost.spec b/boost.spec
index d834601..214a4e1 100644
--- a/boost.spec
+++ b/boost.spec
@@ -32,7 +32,7 @@ Name: boost
 Summary: The free peer-reviewed portable C++ source libraries
 Version: 1.58.0
 %define version_enc 1_58_0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Boost and MIT and Python
 
 %define toplev_dirname %{name}_%{version_enc}
@@ -124,7 +124,7 @@ Patch65: boost-1.57.0-build-optflags.patch
 # https://svn.boost.org/trac/boost/ticket/10510
 Patch66: boost-1.57.0-uuid-comparison.patch
 
-Patch78: boost-context-use-sysv-not-aapcs.patch
+Patch70: 0001-Changes-required-for-aarch64-support-in-boost-config.patch
 
 %bcond_with tests
 %bcond_with docs_generated
@@ -613,7 +613,7 @@ a number of significant features and is now developed independently
 %patch63 -p1
 %patch65 -p1
 %patch66 -p2
-%patch78 -p1
+%patch70 -p1
 
 # At least python2_version needs to be a macro so that it's visible in
 # %%install as well.
@@ -1233,6 +1233,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/bjam.1*
 
 %changelog
+* Thu Jul 23 2015 Marcin Juszkiewicz <mjuszkiewicz@redhat.com> - 1.58.0-2
+- Re-enable boost::context on AArch64.
+
 * Fri Jul 17 2015 Jonathan Wakely <jwakely@redhat.com> - 1.58.0-1
 - Rebase to 1.58.0