diff --git a/lib/Target/ARM/ARMInstrThumb2.td b/lib/Target/ARM/ARMInstrThumb2.td
index 3ae9fbcf55a..15245c30c56 100644
--- a/lib/Target/ARM/ARMInstrThumb2.td
+++ b/lib/Target/ARM/ARMInstrThumb2.td
@@ -719,9 +719,8 @@ defm t2LSR  : T2I_sh_ir<"lsr", BinOpFrag<(srl  node:$LHS, node:$RHS)>>;
 defm t2ASR  : T2I_sh_ir<"asr", BinOpFrag<(sra  node:$LHS, node:$RHS)>>;
 defm t2ROR  : T2I_sh_ir<"ror", BinOpFrag<(rotr node:$LHS, node:$RHS)>>;
 
-// FIXME should be "rrx $dst,$src" once <rdar://problem/7098328> is fixed
 def t2MOVrx : T2sI<(outs GPR:$dst), (ins GPR:$src),
-                   "mov", ".w $dst, $src, rrx",
+                   "rrx", ".w $dst, $src",
                    [(set GPR:$dst, (ARMrrx GPR:$src))]>;
 
 let Defs = [CPSR] in {
diff --git a/test/CodeGen/Thumb2/thumb2-lsr3.ll b/test/CodeGen/Thumb2/thumb2-lsr3.ll
index a3f7a1a6035..9bc4b5b7c51 100644
--- a/test/CodeGen/Thumb2/thumb2-lsr3.ll
+++ b/test/CodeGen/Thumb2/thumb2-lsr3.ll
@@ -2,7 +2,7 @@
 
 define i1 @test1(i64 %poscnt, i32 %work) {
 entry:
-; CHECK: mov.w r0, r0, rrx
+; CHECK: rrx r0, r0
 ; CHECK: lsrs.w r1, r1, #1
 	%0 = lshr i64 %poscnt, 1
 	%1 = icmp eq i64 %0, 0
@@ -11,7 +11,7 @@ entry:
 
 define i1 @test2(i64 %poscnt, i32 %work) {
 entry:
-; CHECK: mov.w r0, r0, rrx
+; CHECK: rrx r0, r0
 ; CHECK: asrs.w r1, r1, #1
 	%0 = ashr i64 %poscnt, 1
 	%1 = icmp eq i64 %0, 0