diff --git a/flex-2.5.37-aarch64.patch b/flex-2.5.37-aarch64.patch
new file mode 100644
index 0000000..c764bf7
--- /dev/null
+++ b/flex-2.5.37-aarch64.patch
@@ -0,0 +1,36 @@
+diff -urN flex-2.5.36/config.guess flex-2.5.36-aarch64/config.guess
+--- flex-2.5.36/config.guess	2012-06-22 16:02:51.000000000 -0500
++++ flex-2.5.36-aarch64/config.guess	2013-03-03 04:41:12.069186825 -0600
+@@ -854,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 ;;
+     arm*:Linux:*:*)
+ 	eval $set_cc_for_build
+ 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+diff -urN flex-2.5.36/config.sub flex-2.5.36-aarch64/config.sub
+--- flex-2.5.36/config.sub	2012-06-22 16:02:51.000000000 -0500
++++ flex-2.5.36-aarch64/config.sub	2013-03-03 04:41:12.105182658 -0600
+@@ -242,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 \
+@@ -322,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/flex.spec b/flex.spec
index 74496fb..ceec014 100644
--- a/flex.spec
+++ b/flex.spec
@@ -1,7 +1,7 @@
 Summary: A tool for creating scanners (text pattern recognizers)
 Name: flex
 Version: 2.5.37
-Release: 1%{?dist}
+Release: 2%{?dist}
 # parse.c and parse.h are under GPLv3+ with exception which allows
 #	relicensing.  Since flex is shipped under BDS-style license,
 #	let's  assume that the relicensing was done.
@@ -14,6 +14,9 @@ Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 # https://sourceforge.net/tracker/?func=detail&aid=3546447&group_id=97492&atid=618177
 Patch0: flex-2.5.36-bison-2.6.1.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=925801
+Patch1: flex-2.5.37-aarch64.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: m4
 BuildRequires: gettext bison m4
@@ -60,6 +63,7 @@ plain text and PDF formats.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %global flexdocdir %{_datadir}/doc/flex-doc-%{version}
 
@@ -120,6 +124,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_datadir}/doc/flex-doc-%{version}
 
 %changelog
+* Thu Apr  4 2013 Petr Machata <pmachata@redhat.com> - 2.5.37-2
+- Update config.sub and config.guess to support aarch64
+
 * Wed Mar 20 2013 Petr Machata <pmachata@redhat.com> - 2.5.37-1
 - Rebase to 2.5.37