diff --git a/make-3.82-aarch64.patch b/make-3.82-aarch64.patch
new file mode 100644
index 0000000..5de499b
--- /dev/null
+++ b/make-3.82-aarch64.patch
@@ -0,0 +1,36 @@
+diff -urN make-3.82/config/config.guess make-3.82-aarch64/config/config.guess
+--- make-3.82/config/config.guess	2010-07-28 00:42:10.000000000 -0500
++++ make-3.82-aarch64/config/config.guess	2013-03-08 02:14:38.142779089 -0600
+@@ -858,6 +868,13 @@
+     i*86:Minix:*:*)
+ 	echo ${UNAME_MACHINE}-pc-minix
+ 	exit ;;
++    aarch64:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
++    aarch64_be:Linux:*:*)
++	UNAME_MACHINE=aarch64_be
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
+     alpha:Linux:*:*)
+ 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+ 	  EV5)   UNAME_MACHINE=alphaev5 ;;
+diff -urN make-3.82/config/config.sub make-3.82-aarch64/config/config.sub
+--- make-3.82/config/config.sub	2010-07-28 00:42:11.000000000 -0500
++++ make-3.82-aarch64/config/config.sub	2013-03-08 02:14:38.175775288 -0600
+@@ -247,6 +255,7 @@
+ 	# Some are omitted here because they have special meanings below.
+ 	1750a | 580 \
+ 	| a29k \
++	| aarch64 | aarch64_be \
+ 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+ 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ 	| am33_2.0 \
+@@ -338,6 +367,7 @@
+ 	# Recognize the basic CPU types with company name.
+ 	580-* \
+ 	| a29k-* \
++	| aarch64-* | aarch64_be-* \
+ 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+ 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+ 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
diff --git a/make.spec b/make.spec
index ccc0826..018a045 100644
--- a/make.spec
+++ b/make.spec
@@ -3,7 +3,7 @@ Summary: A GNU tool which simplifies the build process for users
 Name: make
 Epoch: 1
 Version: 3.82
-Release: 15%{?dist}
+Release: 16%{?dist}
 License: GPLv2+
 Group: Development/Tools
 URL: http://www.gnu.org/software/make/
@@ -38,6 +38,9 @@ Patch15: make-3.82-expensive_glob.patch
 # Upstream: https://savannah.gnu.org/bugs/?30653
 Patch16: make-3.82-dont-prune-intermediate.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=926115
+Patch17: make-3.82-aarch64.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -68,6 +71,7 @@ makefile.
 %patch14 -p1
 %patch15 -p0
 %patch16 -p0
+%patch17 -p1
 rm -f tests/scripts/features/parallelism.orig
 
 %build
@@ -111,6 +115,9 @@ fi
 %{_infodir}/*.info*
 
 %changelog
+* Thu Apr  4 2013 Petr Machata <pmachata@redhat.com> - 1:3.82-16
+- Update config.sub and config.guess to support aarch64
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:3.82-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild