diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f1b17338e7e..8b3a4bc6bc1 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -11,6 +11,11 @@
 
 2014-08-14  DJ Delorie  <dj@redhat.com>
 
+	* config/rl78/predicates.md (rl78_near_mem_operand): New.
+	* config/rl78/rl78-virt.md (movqi_virt_mm, movqi_virt)
+	(movhi_virt_mm): Split out near mem-mem moves to avoid problems
+	with far-far moves.
+
 	* config/rl78/rl78-expand.md (umulqihi3): Disable for G10.
 	* config/rl78/rl78-virt.md (umulhi3_shift_virt): Likewise.
 	(umulqihi3_virt): Likewise.
diff --git a/gcc/config/rl78/predicates.md b/gcc/config/rl78/predicates.md
index e564f436953..f94f124b6c9 100644
--- a/gcc/config/rl78/predicates.md
+++ b/gcc/config/rl78/predicates.md
@@ -33,6 +33,11 @@
        (not (match_test "rl78_far_p (op)")))
 )
 
+(define_predicate "rl78_near_mem_operand"
+  (and (match_code "mem")
+       (match_test "!rl78_far_p (op) && rl78_as_legitimate_address (VOIDmode, XEXP (op, 0), true, ADDR_SPACE_GENERIC)"))
+)
+
 (define_predicate "ubyte_operand"
   (and (match_code "const_int")
        (match_test "IN_RANGE (INTVAL (op), 0, 255)")))
diff --git a/gcc/config/rl78/rl78-virt.md b/gcc/config/rl78/rl78-virt.md
index 39488af98ec..07e5715c803 100644
--- a/gcc/config/rl78/rl78-virt.md
+++ b/gcc/config/rl78/rl78-virt.md
@@ -33,14 +33,30 @@
 
 ;;---------- Moving ------------------------
 
-(define_insn "*movqi_virt"
-  [(set (match_operand:QI 0 "nonimmediate_operand" "=vY,v,Wfr")
-	(match_operand    1 "general_operand" "vInt8JY,Wfr,vInt8J"))]
+(define_insn "*movqi_virt_mm"
+  [(set (match_operand:QI 0 "rl78_near_mem_operand" "=Y")
+	(match_operand    1 "rl78_near_mem_operand" "Y"))]
   "rl78_virt_insns_ok ()"
   "v.mov %0, %1"
   [(set_attr "valloc" "op1")]
 )
 
+(define_insn "*movqi_virt"
+  [(set (match_operand:QI 0 "nonimmediate_operand" "=vY,v,Wfr")
+	(match_operand    1 "general_operand" "vInt8J,YWfr,vInt8J"))]
+  "rl78_virt_insns_ok ()"
+  "v.mov %0, %1"
+  [(set_attr "valloc" "op1")]
+)
+
+(define_insn "*movhi_virt_mm"
+  [(set (match_operand:HI 0 "rl78_near_mem_operand" "=Y")
+	(match_operand:HI 1 "rl78_near_mem_operand" "Y"))]
+  "rl78_virt_insns_ok ()"
+  "v.movw %0, %1"
+  [(set_attr "valloc" "op1")]
+)
+
 (define_insn "*movhi_virt"
   [(set (match_operand:HI 0 "nonimmediate_operand" "=vS,  Y,   v,   Wfr")
 	(match_operand:HI 1 "general_operand"      "viYS, viS, Wfr, vi"))]