diff --git a/net/tftp.c b/net/tftp.c
index ca12638..053b8f3 100644
--- a/net/tftp.c
+++ b/net/tftp.c
@@ -354,7 +354,8 @@
 			tftp_retries++;
 		}
 
-		if (tftp_retries > PKT_NUM_RETRIES) {
+		/* Wait for two TIMEOUT periods and add some */
+		if (tftp_retries > 2 * TIMEOUT + 1) {
 			tftp_err = -ETIMEDOUT;
 			break;
 		}