diff --git a/ChangeLog b/ChangeLog
index 0573d7251..977738f1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-08  Yoshinori K. Okuji  <okuji@enbug.org>
+
+	* netboot/fsys_tftp.c (tftp_read): Don't call buf_fill unless
+	SIZE is positive.
+	
 2002-05-08  Yoshinori K. Okuji  <okuji@enbug.org>
 
 	* netboot/etherboot.h (ETH_MAX_MTU): Because some DHCP/BOOTP
diff --git a/THANKS b/THANKS
index b9685b27e..4db2f3c39 100644
--- a/THANKS
+++ b/THANKS
@@ -33,6 +33,7 @@ Erik Schoenfelder <schoenfr@gaertner.de>
 Eugene Doudine <dudin@np.nk.nornik.ru>
 Florian Hatat <mininet@wanadoo.fr>
 Frank Mehnert <fm3@os.inf.tu-dresden.de>
+Gary Poppitz <gpoppitz@tachyon.net>
 Goran Koruga <goran.koruga@hermes.si>
 Hal Snyder <hal@vailsys.com>
 HASEGAWA Tomoki <thasegawa@mta.biglobe.ne.jp>
diff --git a/netboot/etherboot.h b/netboot/etherboot.h
index f0c35f1d0..74ca16f8d 100644
--- a/netboot/etherboot.h
+++ b/netboot/etherboot.h
@@ -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
diff --git a/netboot/fsys_tftp.c b/netboot/fsys_tftp.c
index cffb85f78..05dea899a 100644
--- a/netboot/fsys_tftp.c
+++ b/netboot/fsys_tftp.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
@@ -389,7 +389,7 @@ tftp_read (char *addr, int size)
 	}
 
       /* Read the data.  */
-      if (! buf_fill (0))
+      if (size > 0 && ! buf_fill (0))
 	{
 	  errnum = ERR_READ;
 	  return 0;