diff --git a/.gitignore b/.gitignore
index 1762deb..3528180 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,5 @@
 /elfutils-0.156.tar.bz2
 /elfutils-0.157.tar.bz2
+/funcretval_test_aarch64.bz2
+/hello_aarch64.ko.bz2
+/testfile_aarch64_core.bz2
diff --git a/elfutils.spec b/elfutils.spec
index 54e11a0..05bcf9e 100644
--- a/elfutils.spec
+++ b/elfutils.spec
@@ -1,7 +1,7 @@
 Name: elfutils
 Summary: A collection of utilities and DSOs to handle compiled objects
 Version: 0.157
-%global baserelease 2
+%global baserelease 3
 URL: https://fedorahosted.org/elfutils/
 %global source_url http://fedorahosted.org/releases/e/l/elfutils/%{version}/
 License: GPLv3+ and (GPLv2+ or LGPLv3+)
@@ -43,8 +43,16 @@ Group: Development/Tools
 %global depsuffix %{?_isa}%{!?_isa:-%{_arch}}
 
 Source: %{?source_url}%{name}-%{version}.tar.bz2
+Source2: funcretval_test_aarch64.bz2
+Source3: hello_aarch64.ko.bz2
+Source4: testfile_aarch64_core.bz2
+
 Patch1: %{?source_url}elfutils-robustify.patch
 Patch2: %{?source_url}elfutils-portability.patch
+Patch3: elfutils-0.157-aarch64-elf.h.patch
+Patch4: elfutils-0.157-aarch64-hidden_format.patch
+Patch5: elfutils-0.157-aarch64-meat.patch
+Patch6: elfutils-0.157-aarch64-configury.patch
 
 %if !%{compat}
 Release: %{baserelease}%{?dist}
@@ -209,6 +217,12 @@ sed -i.scanf-m -e 's/%m/%a/g' src/addr2line.c tests/line2addr.c
 %endif
 %endif
 
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+cp %{SOURCE2} %{SOURCE3} %{SOURCE4} tests/
+
 find . -name \*.sh ! -perm -0100 -print | xargs chmod +x
 
 %build
@@ -323,6 +337,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/libelf.a
 
 %changelog
+* Fri Dec 13 2013 Petr Machata <pmachata@redhat.com> - 0.157-3
+- Add upstream support for aarch64
+
 * Wed Oct  9 2013 Mark Wielaard <mjw@redhat.com> 0.157-2
 - Show tests/test-suite.log in build.log when make check fails.
 
diff --git a/sources b/sources
index 4699c5e..40b5503 100644
--- a/sources
+++ b/sources
@@ -1 +1,4 @@
 0f6746a55f0bc26558f0c162fe137fa1  elfutils-0.157.tar.bz2
+cde23bccde69f1d3ee1ba8228cdfe40b  funcretval_test_aarch64.bz2
+8723bd0835675fd6531ae2df76235852  hello_aarch64.ko.bz2
+6b0f0d28bef1319f47d30a39d4f74f7c  testfile_aarch64_core.bz2