diff --git a/CHANGELOG b/CHANGELOG
index 263e1880..08c045b2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -65,6 +65,10 @@ HISTORY
 
   ++ Bugfixes:
 
+  2009-02-1" Simon Goldschmidt
+  * dhcp.c: fixed bug #25345 (DHCPDECLINE is sent with "Maximum message size"
+    option)
+
   2009-02-11 Simon Goldschmidt
   * dhcp.c: fixed bug #24480 (releasing old udp_pdb and pbuf in dhcp_start)
 
diff --git a/src/core/dhcp.c b/src/core/dhcp.c
index 1e5f0dac..60bf7974 100644
--- a/src/core/dhcp.c
+++ b/src/core/dhcp.c
@@ -732,9 +732,6 @@ dhcp_decline(struct netif *netif)
     dhcp_option(dhcp, DHCP_OPTION_MESSAGE_TYPE, DHCP_OPTION_MESSAGE_TYPE_LEN);
     dhcp_option_byte(dhcp, DHCP_DECLINE);
 
-    dhcp_option(dhcp, DHCP_OPTION_MAX_MSG_SIZE, DHCP_OPTION_MAX_MSG_SIZE_LEN);
-    dhcp_option_short(dhcp, 576);
-
     dhcp_option(dhcp, DHCP_OPTION_REQUESTED_IP, 4);
     dhcp_option_long(dhcp, ntohl(dhcp->offered_ip_addr.addr));