diff --git a/src/net/udp/dhcp.c b/src/net/udp/dhcp.c
index 28f7e1d7..2c1e76d9 100644
--- a/src/net/udp/dhcp.c
+++ b/src/net/udp/dhcp.c
@@ -160,6 +160,10 @@ static int create_dhcp_packet ( struct dhcp_packet *dhcppkt,
 		return -ENOSPC;
 
 	/* Initialise DHCP packet content */
+
+        /* FIXME: wrong place to fix this. */
+        memset ( dhcppkt, 0, sizeof ( *dhcppkt ) );
+
 	memset ( dhcphdr, 0, max_len );
 	dhcphdr->xid = dhcp_xid ( netdev );
 	dhcphdr->magic = htonl ( DHCP_MAGIC_COOKIE );