diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index 9b833522836..4bd0b26aa5e 100644
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -1,3 +1,17 @@
+2012-10-23  Ian Bolton  <ian.bolton@arm.com>
+	    Jim MacArthur  <jim.macarthur@arm.com>
+	    Marcus Shawcroft  <marcus.shawcroft@arm.com>
+	    Nigel Stephens  <nigel.stephens@arm.com>
+	    Ramana Radhakrishnan  <ramana.radhakrishnan@arm.com>
+	    Richard Earnshaw  <rearnsha@arm.com>
+	    Sofiane Naci  <sofiane.naci@arm.com>
+	    Stephen Thomas  <stephen.thomas@arm.com>
+	    Tejas Belagod  <tejas.belagod@arm.com>
+	    Yufeng Zhang  <yufeng.zhang@arm.com>
+
+	* configure.ac: Enable AArch64.
+	* configure: Regenerate.
+
 2012-10-23  Joseph Myers  <joseph@codesourcery.com>
 
 	* files.c (struct _cpp_file): Add implicit_preinclude.
diff --git a/libcpp/configure b/libcpp/configure
index 01e4462307f..d33969b2b2d 100755
--- a/libcpp/configure
+++ b/libcpp/configure
@@ -7096,6 +7096,7 @@ fi
 
 
 case $target in
+	aarch64*-*-* | \
 	alpha*-*-* | \
 	arm*-*-*eabi* | \
 	arm*-*-symbianelf* | \
diff --git a/libcpp/configure.ac b/libcpp/configure.ac
index 29bd8c5e6f1..e62da06ce27 100644
--- a/libcpp/configure.ac
+++ b/libcpp/configure.ac
@@ -134,6 +134,7 @@ fi
 
 m4_changequote(,)
 case $target in
+	aarch64*-*-* | \
 	alpha*-*-* | \
 	arm*-*-*eabi* | \
 	arm*-*-symbianelf* | \