diff --git a/CHANGELOG b/CHANGELOG
index 566bf1c1..7883423b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -95,6 +95,9 @@ HISTORY
 
   ++ Bugfixes:
 
+  2009-05-01 Simon Goldschmidt
+  * ppp.c: bug #24228: Memory corruption with PPP and DHCP
+
   2009-04-29 Frédéric Bernon
   * raw.c, udp.c, init.c, opt.h, ip.h, sockets.h: bug #26309: Implement the
     SO(F)_BROADCAST filter for all API layers. Avoid the unindented reception
diff --git a/src/netif/ppp/ppp.c b/src/netif/ppp/ppp.c
index 264b5d4b..8720c336 100644
--- a/src/netif/ppp/ppp.c
+++ b/src/netif/ppp/ppp.c
@@ -1339,10 +1339,6 @@ sifup(int pd)
     netif_remove(&pc->netif);
     if (netif_add(&pc->netif, &pc->addrs.our_ipaddr, &pc->addrs.netmask, &pc->addrs.his_ipaddr, (void *)pd, pppifNetifInit, ip_input)) {
       netif_set_up(&pc->netif);
-#if LWIP_DHCP
-      /* ugly workaround for storing a reference to the ppp related info*/
-      pc->netif.dhcp = (struct dhcp *) &pc->addrs;
-#endif /* LWIP_DHCP */
       pc->if_up = 1;
       pc->errCode = PPPERR_NONE;