--- client.c	2009-04-17 20:20:40.000000000 +0100
+++ client.c.new	2009-06-15 16:22:24.621453203 +0100
@@ -1392,11 +1392,6 @@ handle_dhcp(struct if_state *state, stru
 		logger(LOG_ERR, "ignoring message; no DHCP type");
 		return 0;
 	}
-	/* Every DHCP message should include ServerID */
-	if (get_option_addr(&addr.s_addr, dhcp, DHO_SERVERID) == -1) {
-		logger(LOG_ERR, "ignoring message; no Server ID");
-		return 0;
-	}
 
 	/* Ensure that it's not from a blacklisted server.
 	 * We should expand this to check IP and/or hardware address