diff --git a/gas/ChangeLog b/gas/ChangeLog
index 1dd992b821..da45ddfcad 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-15  Martin Schwidefsky  <schwidefsky@de.ibm.com>
+
+	* config/tc-s390.c (s390_insn): Avoid incorrect signed/unsigned
+	comparison in .insn pseudo operation.
+
 2004-06-15  Alan Modra  <amodra@bigpond.net.au>
 
 	* config/obj-coff.c (coff_adjust_section_syms): Use
diff --git a/gas/config/tc-s390.c b/gas/config/tc-s390.c
index 2cb8cf1aad..02427283d9 100644
--- a/gas/config/tc-s390.c
+++ b/gas/config/tc-s390.c
@@ -1596,13 +1596,13 @@ s390_insn (ignore)
   if (exp.X_op == O_constant)
     {
       if (   (   opformat->oplen == 6
-	      && exp.X_add_number >= 0
+	      && (addressT) exp.X_add_number >= 0
 	      && (addressT) exp.X_add_number < (1ULL << 48))
 	  || (   opformat->oplen == 4
-	      && exp.X_add_number >= 0
+	      && (addressT) exp.X_add_number >= 0
 	      && (addressT) exp.X_add_number < (1ULL << 32))
 	  || (   opformat->oplen == 2
-	      && exp.X_add_number >= 0
+	      && (addressT) exp.X_add_number >= 0
 	      && (addressT) exp.X_add_number < (1ULL << 16)))
 	md_number_to_chars (insn, exp.X_add_number, opformat->oplen);
       else