diff --git a/RELNOTES b/RELNOTES
index d6b9ac0f..c29cdfa5 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -51,6 +51,12 @@ The system has only been tested on Linux, FreeBSD, and Solaris, and
 may not work on other platforms. Please report any problems and 
 suggested fixes to <dhcp-users@isc.org>.
 
+
+			Changes since 4.0.0a1
+
+- 'dhcp.c(3953): non-null pointer' has been repaired.  This fixes a flaw
+  wherein the DHCPv4 server may use seemingly random source addresses.
+
 			Changes since 4.0.0-20070413
 
 - Old (expired) leases are now cleaned.
diff --git a/server/dhcp.c b/server/dhcp.c
index e45c87b8..9b1fac78 100644
--- a/server/dhcp.c
+++ b/server/dhcp.c
@@ -34,7 +34,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: dhcp.c,v 1.219 2007/05/19 19:16:26 dhankins Exp $ Copyright (c) 2004-2007 Internet Systems Consortium.  All rights reserved.\n";
+"$Id: dhcp.c,v 1.220 2007/05/21 22:09:07 dhankins Exp $ Copyright (c) 2004-2007 Internet Systems Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -3940,11 +3940,12 @@ void
 get_server_source_address(struct in_addr *from,
 			  struct option_state *options,
 			  struct packet *packet) {
-	int option_num;
+	unsigned option_num;
 	struct option_cache *oc;
-       	struct data_string d;
-       	struct in_addr *a;
-	struct option *option;
+	struct data_string d;
+	struct in_addr *a;
+
+	memset(&d, 0, sizeof(d));
 
        	option_num = DHO_DHCP_SERVER_IDENTIFIER;
        	oc = lookup_option(&dhcp_universe, options, option_num);