diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 2eb0336a0a19808c83f82a4536bba2f9ebe1ebb2..be67b6ea5ffc67f49056e2cdc7c23f4bb163e23e 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-20  Yufeng Zhang  <yufeng.zhang@arm.com>
+
+	* gas/aarch64/msr.s: Add tests.
+	* gas/aarch64/msr.d: Update.
+
 2013-11-18  Renlin Li  <Renlin.Li@arm.com>
 
 	* gas/arm/attr-march-armv7ve.d: New test case for armv7ve.
diff --git a/gas/testsuite/gas/aarch64/msr.d b/gas/testsuite/gas/aarch64/msr.d
index c6c32200a4153a09c8934167b4a2ab70172b7a7b..750cae119abb85a748d02735ed920935859930e3 100644
--- a/gas/testsuite/gas/aarch64/msr.d
+++ b/gas/testsuite/gas/aarch64/msr.d
@@ -13,3 +13,5 @@ Disassembly of section \.text:
   14:	d5034fff 	msr	daifclr, #0xf
   18:	d51b4220 	msr	daif, x0
   1c:	d53b4220 	mrs	x0, daif
+  20:	d50040bf 	msr	spsel, #0x0
+  24:	d50041bf 	msr	spsel, #0x1
diff --git a/gas/testsuite/gas/aarch64/msr.s b/gas/testsuite/gas/aarch64/msr.s
index 9f67d98771343abab10e785c03726a03114fba35..01018c289d1df399485e824aa07f8228184d182a 100644
--- a/gas/testsuite/gas/aarch64/msr.s
+++ b/gas/testsuite/gas/aarch64/msr.s
@@ -1,5 +1,5 @@
 /*
-   Copyright 2011, 2012 Free Software Foundation, Inc.
+   Copyright 2011-2013 Free Software Foundation, Inc.
    Contributed by ARM Ltd.
 
    This file is part of GAS.
@@ -31,3 +31,6 @@ func:
 
 	msr daif, x0
 	mrs x0, daif
+
+	msr spsel, #0
+	msr spsel, #1
diff --git a/include/opcode/ChangeLog b/include/opcode/ChangeLog
index 02f337299196db3b9afb494e4d21284049565120..b8a99f89823bcef19e68f2e2a61c8ef44dfceaf2 100644
--- a/include/opcode/ChangeLog
+++ b/include/opcode/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-20  Yufeng Zhang  <yufeng.zhang@arm.com>
+
+	* aarch64.h (aarch64_pstatefields): Change element type to
+	aarch64_sys_reg.
+
 2013-11-18  Renlin Li  <Renlin.Li@arm.com>
 
 	* arm.h (ARM_AEXT_V7VE): New define.
diff --git a/include/opcode/aarch64.h b/include/opcode/aarch64.h
index 4a3a312b68338e3395970492453469ab50dad5e5..053294e33588fad8f4e8c1d3a3acdef226d03bba 100644
--- a/include/opcode/aarch64.h
+++ b/include/opcode/aarch64.h
@@ -611,7 +611,6 @@ struct aarch64_name_value_pair
 };
 
 extern const struct aarch64_name_value_pair aarch64_operand_modifiers [];
-extern const struct aarch64_name_value_pair aarch64_pstatefields [];
 extern const struct aarch64_name_value_pair aarch64_barrier_options [16];
 extern const struct aarch64_name_value_pair aarch64_prfops [32];
 
@@ -623,6 +622,7 @@ typedef struct
 } aarch64_sys_reg;
 
 extern const aarch64_sys_reg aarch64_sys_regs [];
+extern const aarch64_sys_reg aarch64_pstatefields [];
 extern bfd_boolean aarch64_sys_reg_deprecated_p (const aarch64_sys_reg *);
 
 typedef struct
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 75532119abe6956953f573844d1b60b105520fcd..0b72d5b6fe22d369aadb8f5aa3286c188027dd68 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-20  Yufeng Zhang  <yufeng.zhang@arm.com>
+
+	* aarch64-opc.c (aarch64_pstatefields): Update.
+
 2013-11-18  Yufeng Zhang  <yufeng.zhang@arm.com>
 
 	Revert
diff --git a/opcodes/aarch64-opc.c b/opcodes/aarch64-opc.c
index af1472a58240659a2de0dcec331423740d2123da..43133279df6e21d2b62d74030dd4c5d358022a88 100644
--- a/opcodes/aarch64-opc.c
+++ b/opcodes/aarch64-opc.c
@@ -3019,12 +3019,12 @@ aarch64_sys_reg_deprecated_p (const aarch64_sys_reg *reg)
   return (reg->flags & F_DEPRECATED) != 0;
 }
 
-const struct aarch64_name_value_pair aarch64_pstatefields [] =
+const aarch64_sys_reg aarch64_pstatefields [] =
 {
-  { "spsel",            0x05  },
-  { "daifset",          0x1e  },
-  { "daifclr",          0x1f  },
-  { 0,          CPENC(0,0,0,0,0)  },
+  { "spsel",            0x05,	0 },
+  { "daifset",          0x1e,	0 },
+  { "daifclr",          0x1f,	0 },
+  { 0,          CPENC(0,0,0,0,0), 0 },
 };
 
 const aarch64_sys_ins_reg aarch64_sys_regs_ic[] =