diff --git a/usr.bin/ftp/cmds.c b/usr.bin/ftp/cmds.c
index 6d45ac115841..6c65ad26dea6 100644
--- a/usr.bin/ftp/cmds.c
+++ b/usr.bin/ftp/cmds.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cmds.c,v 1.82 2000/01/31 22:01:03 lukem Exp $	*/
+/*	$NetBSD: cmds.c,v 1.83 2000/04/13 08:13:30 lukem Exp $	*/
 
 /*-
  * Copyright (c) 1996-1999 The NetBSD Foundation, Inc.
@@ -107,7 +107,7 @@
 #if 0
 static char sccsid[] = "@(#)cmds.c	8.6 (Berkeley) 10/9/94";
 #else
-__RCSID("$NetBSD: cmds.c,v 1.82 2000/01/31 22:01:03 lukem Exp $");
+__RCSID("$NetBSD: cmds.c,v 1.83 2000/04/13 08:13:30 lukem Exp $");
 #endif
 #endif /* not lint */
 
@@ -2380,7 +2380,7 @@ restart(argc, argv)
 		char *ep;
 
 #ifndef NO_QUAD
-		rp = strtoq(argv[1], &ep, 10);
+		rp = strtoll(argv[1], &ep, 10);
 #else
 		rp = strtol(argv[1], &ep, 10);
 #endif
diff --git a/usr.bin/ftp/fetch.c b/usr.bin/ftp/fetch.c
index 55bc197c4f4f..be1c28e161df 100644
--- a/usr.bin/ftp/fetch.c
+++ b/usr.bin/ftp/fetch.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fetch.c,v 1.107 2000/03/09 22:07:59 itojun Exp $	*/
+/*	$NetBSD: fetch.c,v 1.108 2000/04/13 08:13:31 lukem Exp $	*/
 
 /*-
  * Copyright (c) 1997-1999 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: fetch.c,v 1.107 2000/03/09 22:07:59 itojun Exp $");
+__RCSID("$NetBSD: fetch.c,v 1.108 2000/04/13 08:13:31 lukem Exp $");
 #endif /* not lint */
 
 /*
@@ -892,7 +892,7 @@ fetch_url(url, proxyenv, proxyauth, wwwauth)
 					sizeof(CONTENTLEN) - 1) == 0) {
 				cp += sizeof(CONTENTLEN) - 1;
 #ifndef NO_QUAD
-				filesize = strtoq(cp, &ep, 10);
+				filesize = strtoll(cp, &ep, 10);
 #else
 				filesize = strtol(cp, &ep, 10);
 #endif
@@ -912,7 +912,7 @@ fetch_url(url, proxyenv, proxyauth, wwwauth)
 					sizeof(CONTENTRANGE) - 1) == 0) {
 				cp += sizeof(CONTENTRANGE) - 1;
 #ifndef NO_QUAD
-				rangestart = strtoq(cp, &ep, 10);
+				rangestart = strtoll(cp, &ep, 10);
 #else
 				rangestart = strtol(cp, &ep, 10);
 #endif
@@ -921,7 +921,7 @@ fetch_url(url, proxyenv, proxyauth, wwwauth)
 				cp = ep + 1;
 
 #ifndef NO_QUAD
-				rangeend = strtoq(cp, &ep, 10);
+				rangeend = strtoll(cp, &ep, 10);
 #else
 				rangeend = strtol(cp, &ep, 10);
 #endif
@@ -931,7 +931,7 @@ fetch_url(url, proxyenv, proxyauth, wwwauth)
 				cp = ep + 1;
 
 #ifndef NO_QUAD
-				entitylen = strtoq(cp, &ep, 10);
+				entitylen = strtoll(cp, &ep, 10);
 #else
 				entitylen = strtol(cp, &ep, 10);
 #endif
diff --git a/usr.bin/ftp/util.c b/usr.bin/ftp/util.c
index c329fc9d10d6..417dab3e37f8 100644
--- a/usr.bin/ftp/util.c
+++ b/usr.bin/ftp/util.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: util.c,v 1.91 2000/01/31 22:01:05 lukem Exp $	*/
+/*	$NetBSD: util.c,v 1.92 2000/04/13 08:13:31 lukem Exp $	*/
 
 /*-
  * Copyright (c) 1997-1999 The NetBSD Foundation, Inc.
@@ -75,7 +75,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: util.c,v 1.91 2000/01/31 22:01:05 lukem Exp $");
+__RCSID("$NetBSD: util.c,v 1.92 2000/04/13 08:13:31 lukem Exp $");
 #endif /* not lint */
 
 /*
@@ -611,7 +611,7 @@ remotesize(file, noisy)
 		if (cp != NULL) {
 			cp++;
 #ifndef NO_QUAD
-			size = strtoq(cp, &ep, 10);
+			size = strtoll(cp, &ep, 10);
 #else
 			size = strtol(cp, &ep, 10);
 #endif
diff --git a/usr.bin/ftp/version.h b/usr.bin/ftp/version.h
index a15aff18a8e6..6f80784ee28a 100644
--- a/usr.bin/ftp/version.h
+++ b/usr.bin/ftp/version.h
@@ -1,6 +1,6 @@
-/*	$NetBSD: version.h,v 1.5 2000/01/31 22:01:52 lukem Exp $	*/
+/*	$NetBSD: version.h,v 1.6 2000/04/13 08:13:31 lukem Exp $	*/
 /*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
+ * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
  * This code is derived from software contributed to The NetBSD Foundation
@@ -40,5 +40,5 @@
 #endif
 
 #ifndef FTP_VERSION
-#define	FTP_VERSION	"20000201"
+#define	FTP_VERSION	"20000403"
 #endif