diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index aea8ddbbaa1b..0ea100baf5cf 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-31  Richard Henderson  <rth@cygnus.com>
+
+	* flow.c (merge_blocks_nomove): Remove a barrier not following
+	a jump as well.
+
 2000-05-31  Richard Henderson  <rth@cygnus.com>
 
 	* flow.c (propagate_block): Move initialization of mem_set_list ...
diff --git a/gcc/flow.c b/gcc/flow.c
index dcdf96920516..c8762c8ffc4c 100644
--- a/gcc/flow.c
+++ b/gcc/flow.c
@@ -2201,6 +2201,8 @@ merge_blocks_nomove (a, b)
 
       a_end = prev;
     }
+  else if (GET_CODE (NEXT_INSN (a_end)) == BARRIER)
+    del_first = NEXT_INSN (a_end);
 
   /* Delete everything marked above as well as crap that might be
      hanging out between the two blocks.  */