diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bde3cd4f042..be0aab2c876 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2018-12-03  Jeff Law  <law@redhat.com>
+
+	* config/h8300/h8300.md (low byte masking peepholes): Only accept
+	nonimmediate_operand for the to-be-masked operand.
+
 2018-12-03  Richard Biener  <rguenther@suse.de>
 
 	* tree-ssa-sccvn.c (eliminate_dom_walker::eliminate_stmt): Only
diff --git a/gcc/config/h8300/h8300.md b/gcc/config/h8300/h8300.md
index b3ba7e0f719..9e8f7159846 100644
--- a/gcc/config/h8300/h8300.md
+++ b/gcc/config/h8300/h8300.md
@@ -4647,7 +4647,7 @@
 
 (define_peephole2
   [(set (match_operand:SI 0 "register_operand" "")
-	(match_operand:SI 1 "general_operand" ""))
+	(match_operand:SI 1 "nonimmediate_operand" ""))
    (set (match_dup 0)
 	(and:SI (match_dup 0)
 		(const_int 255)))]
@@ -4666,7 +4666,7 @@
 
 (define_peephole2
   [(set (match_operand 0 "register_operand" "")
-	(match_operand 1 "general_operand" ""))
+	(match_operand 1 "nonimmediate_operand" ""))
    (set (match_operand:SI 2 "register_operand" "")
 	(and:SI (match_dup 2)
 		(match_operand:SI 3 "const_int_qi_operand" "")))]