diff --git a/ChangeLog b/ChangeLog
index e90b6b1ec..846b69d5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-22  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/net/tftp.c: Decrease stall to 50 packets.
+
 2012-06-22  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/net/net.c (grub_net_fs_open): Free resources on failed open.
diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c
index 45a908c7d..9c70efbec 100644
--- a/grub-core/net/tftp.c
+++ b/grub-core/net/tftp.c
@@ -224,7 +224,7 @@ tftp_receive (grub_net_udp_socket_t sock __attribute__ ((unused)),
 
 	    grub_priority_queue_pop (data->pq);
 
-	    if (file->device->net->packs.count < 200)
+	    if (file->device->net->packs.count < 50)
 	      err = ack (data, tftph->u.data.block);
 	    else
 	      {
@@ -451,7 +451,7 @@ static grub_err_t
 tftp_packets_pulled (struct grub_file *file)
 {
   tftp_data_t data = file->data;
-  if (file->device->net->packs.count >= 200)
+  if (file->device->net->packs.count >= 50)
     return 0;
 
   if (!file->device->net->eof)