diff --git a/gas/ChangeLog b/gas/ChangeLog
index b80ca11e9ea..2fa231320f6 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-01  Evandro Menezes  <e.menezes@samsung.com>
+
+	* config/tc-aarch64.c: Add support for Samsung Exynos M1.
+	* doc/c-aarch64.texi (-mcpu=): Add "exynos-m1".
+
 2015-04-01  Evandro Menezes  <e.menezes@samsung.com>
 
 	* config/tc-arm.c: Add support for Samsung Exynos M1.
diff --git a/gas/config/tc-aarch64.c b/gas/config/tc-aarch64.c
index ef4fae88658..32ae6d4aeb8 100644
--- a/gas/config/tc-aarch64.c
+++ b/gas/config/tc-aarch64.c
@@ -7320,6 +7320,9 @@ static const struct aarch64_cpu_option_table aarch64_cpus[] = {
 				  AARCH64_FEATURE_CRC), "Cortex-A57"},
   {"cortex-a72", AARCH64_FEATURE (AARCH64_ARCH_V8,
 				  AARCH64_FEATURE_CRC), "Cortex-A72"},
+  {"exynos-m1", AARCH64_FEATURE (AARCH64_ARCH_V8,
+				 AARCH64_FEATURE_CRC | AARCH64_FEATURE_CRYPTO),
+				"Samsung Exynos M1"},
   {"thunderx", AARCH64_ARCH_V8, "Cavium ThunderX"},
   /* The 'xgene-1' name is an older name for 'xgene1', which was used
      in earlier releases and is superseded by 'xgene1' in all
diff --git a/gas/doc/c-aarch64.texi b/gas/doc/c-aarch64.texi
index ce3694ac442..79fe1684238 100644
--- a/gas/doc/c-aarch64.texi
+++ b/gas/doc/c-aarch64.texi
@@ -58,6 +58,7 @@ on the target processor.  The following processor names are recognized:
 @code{cortex-a53},
 @code{cortex-a57},
 @code{cortex-a72},
+@code{exynos-m1},
 @code{thunderx},
 @code{xgene1}
 and