diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1b3a30023cb..dc05aee73ae 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-25  Kaz Kojima  <kkojima@gcc.gnu.org>
+
+	* final.c (shorten_branches): Align the address of code label
+        when computing initial lengths and addresses.
+
 2003-01-25  Kazu Hirata  <kazu@cs.umass.edu>
 
 	* config/m68hc11/m68hc11.md: Fix a comment typo.
diff --git a/gcc/final.c b/gcc/final.c
index 103f65d7a1f..86b0b2f6f41 100644
--- a/gcc/final.c
+++ b/gcc/final.c
@@ -991,7 +991,7 @@ shorten_branches (first)
 	    }
 	}
 
-      INSN_ADDRESSES (uid) = insn_current_address;
+      INSN_ADDRESSES (uid) = insn_current_address + insn_lengths[uid];
 
       if (GET_CODE (insn) == NOTE || GET_CODE (insn) == BARRIER
 	  || GET_CODE (insn) == CODE_LABEL)