--- tftpd/src/srv.c	2014/02/21 08:32:33	1.4.2.1
+++ tftpd/src/srv.c	2014/02/21 08:40:00	1.4.2.2
@@ -163,12 +163,14 @@ getOpts(rpack_t * __restrict pkt, int rlen)
 			cli.tsiz = strtoll(val, NULL, 10);
 		else if (!strcasecmp(opt, TFTP_OPT_TIMEOUT))
 			cli.tout.tv_sec = strtol(val, NULL, 10);
-		else if (!strcasecmp(opt, TFTP_OPT_ROLLOVER))
+		else if (!strcasecmp(opt, TFTP_OPT_ROLLOVER)) {
 			cli.roll = strtol(val, NULL, 10);
+			cli.roll++;
+		}
 	} while (rlen > 0);
 
 	EVERBOSE(4, "blksize=%u tsize=%llu timeout=%u rollover=%u", 
-			cli.siz, cli.tsiz, cli.tout.tv_sec, cli.roll);
+			cli.siz, cli.tsiz, cli.tout.tv_sec, cli.roll - 1);
 	return 0;
 }
 
@@ -209,13 +211,13 @@ txOack(sched_task_t *task)
 	}
 	if (cli.roll) {
 		memset(szStr, 0, sizeof szStr);
-		snprintf(szStr, sizeof szStr, "%u", cli.roll);
+		snprintf(szStr, sizeof szStr, "%u", cli.roll - 1);
 		rpack_rdata(pkt, TFTP_OPT_ROLLOVER, strlen(TFTP_OPT_ROLLOVER) + 1);
 		rpack_rdata(pkt, szStr, strlen(szStr) + 1);
 	}
 
 	EVERBOSE(4, "blksize=%u tsize=%llu timeout=%u rollover=%u", 
-			cli.siz, cli.tsiz, cli.tout.tv_sec, cli.roll);
+			cli.siz, cli.tsiz, cli.tout.tv_sec, cli.roll - 1);
 	schedCallOnce(TASK_ROOT(task), txPkt, NULL, TASK_FD(task), 
 			TASK_DATA(task), RPACK_OFF(pkt));
 	taskExit(task, NULL);
@@ -358,7 +360,7 @@ ACK(sched_task_t *task)
 	} else if (ntohs(code) == cli.seq) {
 		/* check for rollover seq id */
 		if (cli.roll && cli.seq == USHRT_MAX)
-			cli.seq = cli.roll;
+			cli.seq = cli.roll - 1;
 		else
 			cli.seq++;
 	}