diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0f8ebea5cc5..586b35aa2b9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-25  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* config/s390/s390.c (legitimize_pic_address): Use s390_load_address
+	to load addresses.
+
 2004-11-25  Mark Mitchell  <mark@codesourcery.com>
 
 	PR c++/18001
diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c
index 54d2b1edb10..cca3d87ba8b 100644
--- a/gcc/config/s390/s390.c
+++ b/gcc/config/s390/s390.c
@@ -2810,7 +2810,7 @@ legitimize_pic_address (rtx orig, rtx reg)
           new = gen_rtx_PLUS (Pmode, pic_offset_table_rtx, temp);
           if (reg != 0)
             {
-              emit_move_insn (reg, new);
+              s390_load_address (reg, new);
               new = reg;
             }
         }
@@ -2919,7 +2919,7 @@ legitimize_pic_address (rtx orig, rtx reg)
                         new = gen_rtx_PLUS (Pmode, pic_offset_table_rtx, temp);
                         if (reg != 0)
                           {
-                            emit_move_insn (reg, new);
+                            s390_load_address (reg, new);
                             new = reg;
                           }
                       }
@@ -2963,7 +2963,7 @@ legitimize_pic_address (rtx orig, rtx reg)
 
                       if (reg != 0)
                         {
-                          emit_move_insn (reg, new);
+                          s390_load_address (reg, new);
                           new = reg;
                         }
                     }
@@ -2992,7 +2992,7 @@ legitimize_pic_address (rtx orig, rtx reg)
                   new = gen_rtx_PLUS (Pmode, pic_offset_table_rtx, temp);
                   if (reg != 0)
                     {
-                      emit_move_insn (reg, new);
+                      s390_load_address (reg, new);
                       new = reg;
                     }
                 }