diff --git a/ChangeLog b/ChangeLog
index f25f23b1a..df4be0254 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-06-12  Yoshinori K. Okuji  <okuji@enbug.org>
+
+	* netboot/main.c (ifconfig): If GW is specified, clear out the
+	ARP entry for the gateway. If SVR is specified, clear out the
+	ARP entry for the server. Reported by Uwe Dannowski
+	<ud3@ira.uka.de>.
+	
 2002-06-12  Yoshinori K. Okuji  <okuji@enbug.org>
 
 	* util/grub-md5-crypt.in: Prompt to retype a password, and check
diff --git a/NEWS b/NEWS
index 8426b0d17..f1633eccd 100644
--- a/NEWS
+++ b/NEWS
@@ -18,6 +18,8 @@ New in 0.93:
   input characters. If you specify ``--no-edit'', GRUB will disable the
   BASH-like editing feature. These options are useful when using an
   intelligent terminal (such as the comint mode in GNU Emacs).
+* The utility ``grub-md5-crypt'' prompts to retype a password and checks
+  if the passwords match.
 
 New in 0.92 - 2002-04-30:
 * The command "displaymem" uses only hex digits for consistency.
diff --git a/THANKS b/THANKS
index 5e166f43b..ec17d8c6c 100644
--- a/THANKS
+++ b/THANKS
@@ -88,6 +88,7 @@ Thierry DELHAISE <thierry.delhaise@delhaise.com>
 Thierry Laronde <thierry.laronde@polynum.com>
 Thomas Schweikle <tschweikle@fiducia.de>
 Torsten Duwe <duwe@caldera.de>
+Uwe Dannowski <ud3@ira.uka.de>
 VaX#n8 <vax@linkdead.paranoia.com>
 Vesa Jaaskelainen <jaaskela@tietomyrsky.fi>
 Yedidyah Bar-David <didi@post.tau.ac.il>
diff --git a/netboot/main.c b/netboot/main.c
index 031749f3a..140cbea31 100644
--- a/netboot/main.c
+++ b/netboot/main.c
@@ -1,6 +1,6 @@
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2000, 2001  Free Software Foundation, Inc.
+ *  Copyright (C) 2000,2001,2002  Free Software Foundation, Inc.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -167,9 +167,15 @@ ifconfig (char *ip, char *sm, char *gw, char *svr)
   
   if (gw && ! inet_aton (gw, &arptable[ARP_GATEWAY].ipaddr)) 
     return 0;
+
+  /* Clear out the ARP entry.  */
+  grub_memset (arptable[ARP_GATEWAY].node, 0, ETH_ALEN);
   
   if (svr && ! inet_aton (svr, &arptable[ARP_SERVER].ipaddr)) 
     return 0;
+
+  /* Likewise.  */
+  grub_memset (arptable[ARP_SERVER].node, 0, ETH_ALEN);
   
   if (ip || sm)
     {