diff --git a/CHANGELOG b/CHANGELOG
index 4ffa752d..46f2c0e0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-TODO
+FUTURE
 
   * TODO: The lwIP source code makes some invalid assumptions on processor
     word-length, storage sizes and alignment. See the mailing lists for
@@ -7,6 +7,17 @@ TODO
 
 HISTORY
 
+(HEAD)
+
+  ++ Bug fixes:
+
+  2004-04-23 Leon Woestenberg <leon.woestenberg@gmx.net>
+  * ip_addr.c: Fix in the ip_addr_isbroadcast() check.
+  * etharp.c: Fixed the case where the packet that initiates the ARP request
+    is not queued, and gets lost. Fixed the case where the packets destination
+    address is already known; we now always queue the packet and perform an ARP
+    request.
+  
 (STABLE-0_7_0)
 
   ++ Bug fixes: