diff --git a/ChangeLog b/ChangeLog
index bea3492e3c..fe63971769 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-02-21  Andreas Jaeger  <aj@suse.de>
+
+	* elf/dl-load.c (_dl_map_object_from_fd): Fix casts used as lvalue.
+
+	* iconv/gconv_simple.c (internal_ucs4le_loop): Remove cast used as
+	lvalue.
+
 2004-02-19  Carlos O'Donell  <carlos@baldric.uwo.ca>
 
 	* sysdeps/generic/framestate.c [__USING_SJLJ_EXCEPTIONS__]
diff --git a/elf/dl-load.c b/elf/dl-load.c
index 8b9e508571..cba75f62fa 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -1228,7 +1228,7 @@ cannot allocate TLS data structures for initial thread");
       }
     else
       /* Adjust the PT_PHDR value by the runtime load address.  */
-      (ElfW(Addr)) l->l_phdr += l->l_addr;
+      l->l_phdr = (ElfW(Phdr) *) ((ElfW(Addr)) l->l_phdr + l->l_addr);
   }
 
 #ifdef USE_TLS
@@ -1254,7 +1254,7 @@ cannot allocate TLS data structures for initial thread");
 	}
     }
   else
-    (ElfW(Addr)) l->l_ld += l->l_addr;
+    l->l_ld = (ElfW(Dyn) *) ((ElfW(Addr)) l->l_ld + l->l_addr);
 
   l->l_entry += l->l_addr;