diff --git a/gas/ChangeLog b/gas/ChangeLog
index 639b744862..49a22c0611 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2003-04-18  Jakub Jelinek  <jakub@redhat.com>
+
+	* ehopt.c (check_eh_frame): For aug_size == 0
+	in state_seeing_aug_size state skip the state_skipping_aug
+	state.
+
 2003-04-15  Rohit Kumar Srivastava <rohits@kpitcummins.com>
 
 	* doc/c-h8300.texi: Replace occurrances of 'Hitachi' with
diff --git a/gas/ehopt.c b/gas/ehopt.c
index 4f5c9b26f3..6e19ae69bf 100644
--- a/gas/ehopt.c
+++ b/gas/ehopt.c
@@ -1,5 +1,5 @@
 /* ehopt.c--optimize gcc exception frame information.
-   Copyright 1998, 2000, 2001 Free Software Foundation, Inc.
+   Copyright 1998, 2000, 2001, 2003 Free Software Foundation, Inc.
    Written by Ian Lance Taylor <ian@cygnus.com>.
 
 This file is part of GAS, the GNU Assembler.
@@ -363,6 +363,8 @@ check_eh_frame (exp, pnbytes)
 	}
       else
 	d->state = state_error;
+      if (d->state == state_skipping_aug && d->aug_size == 0)
+	d->state = state_wait_loc4;
       break;
 
     case state_skipping_aug: