--- /n/sources/plan9/sys/src/cmd/5l/obj.c	Sat Jan 10 10:00:05 2015
+++ /sys/src/cmd/5l/obj.c	Sun Jun 28 00:00:00 2026
@@ -313,8 +313,8 @@ out:
 	if(debug['v']) {
 		Bprint(&bso, "%5.2f cpu time\n", cputime());
 		Bprint(&bso, "%ld memory used\n", thunk);
-		Bprint(&bso, "%d sizeof adr\n", sizeof(Adr));
-		Bprint(&bso, "%d sizeof prog\n", sizeof(Prog));
+		Bprint(&bso, "%lld sizeof adr\n", (vlong)sizeof(Adr));
+		Bprint(&bso, "%lld sizeof prog\n", (vlong)sizeof(Prog));
 	}
 	Bflush(&bso);
 	errorexit();
--- /n/sources/plan9/sys/src/cmd/9l/obj.c	Sat Jan 10 10:00:05 2015
+++ /sys/src/cmd/9l/obj.c	Sun Jun 28 00:00:00 2026
@@ -311,8 +311,8 @@ out:
 	if(debug['v']) {
 		Bprint(&bso, "%5.2f cpu time\n", cputime());
 		Bprint(&bso, "%ld memory used\n", tothunk);
-		Bprint(&bso, "%d sizeof adr\n", sizeof(Adr));
-		Bprint(&bso, "%d sizeof prog\n", sizeof(Prog));
+		Bprint(&bso, "%lld sizeof adr\n", (vlong)sizeof(Adr));
+		Bprint(&bso, "%lld sizeof prog\n", (vlong)sizeof(Prog));
 	}
 	errorexit();
 }
--- /n/sources/plan9/sys/src/cmd/9nfs/9p.c	Sat Jan 10 10:00:05 2015
+++ /sys/src/cmd/9nfs/9p.c	Sun Jun 28 00:00:00 2026
@@ -128,7 +128,7 @@ newfid(Session *s)
 		*(f->owner) = 0;
 		f->owner = 0;
 	}
-	chat("%ld...", f - s->fids);
+	chat("%lld...", (vlong)(f - s->fids));
 	f->tstale = nfstime + staletime;
 	return f;
 }
@@ -151,7 +151,7 @@ setfid(Session *s, Fid *f)
 void
 putfid(Session *s, Fid *f)
 {
-	chat("putfid %ld...", f-s->fids);
+	chat("putfid %lld...", (vlong)(f - s->fids));
 	if(s == 0 || f == 0){
 		clog("putfid(0x%p, 0x%p) %s", s, f, (s ? s->service : "?"));
 		return;
--- /n/sources/plan9/sys/src/cmd/9nfs/nfs.c	Sat Jan 10 10:00:05 2015
+++ /sys/src/cmd/9nfs/nfs.c	Sun Jun 28 00:00:00 2026
@@ -330,7 +330,7 @@ xfwalkcr(int type, Xfid *xf, String *elem, long perm)
 		newxf->urfid = nfid;
 		nfid->owner = &newxf->urfid;
 	}else if(newxf->urfid){
-		chat("old xfid %ld...", newxf->urfid-s->fids);
+		chat("old xfid %lld...", (vlong)(newxf->urfid - s->fids));
 		clunkfid(s, nfid);
 	}else{
 		newxf->urfid = nfid;
--- /n/sources/plan9/sys/src/cmd/9nfs/nfsmount.c	Sat Jan 10 10:00:05 2015
+++ /sys/src/cmd/9nfs/nfsmount.c	Sun Jun 28 00:00:00 2026
@@ -159,8 +159,8 @@ srvinit(int fd, char *file, char *addr)
 	xp->name = "/";
 	xf = xfid("none", xp, 1);
 	xf->urfid = f;
-	clog("service=%s uid=%s fid=%ld\n",
-		s->service, xf->uid, xf->urfid - s->fids);
+	clog("service=%s uid=%s fid=%lld\n",
+		s->service, xf->uid, (vlong)(xf->urfid - s->fids));
 	if(tail)
 		tail->next = s;
 	else
--- /n/sources/plan9/sys/src/cmd/9nfs/string.c	Sat Jan 10 10:00:05 2015
+++ /sys/src/cmd/9nfs/string.c	Sun Jun 28 00:00:00 2026
@@ -57,7 +57,7 @@ strprint(int fd)
 
 	for(bin = stab; bin < stab+STRHASH; bin++)
 		for(x=*bin; x; x=x->next)
-			fprint(fd, "%ld %s\n", bin-stab, x->str);
+			fprint(fd, "%lld %s\n", (vlong)(bin - stab), x->str);
 }
 
 static long
--- /n/sources/plan9/sys/src/cmd/ar.c	Sat Jan 10 10:00:05 2015
+++ /sys/src/cmd/ar.c	Sun Jun 28 00:00:00 2026
@@ -670,9 +670,9 @@ rderr(void)
 }
 
 void
-phaseerr(int offset)
+phaseerr(vlong offset)
 {
-	fprint(2, "ar: phase error at offset %d\n", offset);
+	fprint(2, "ar: phase error at offset %lld\n", offset);
 	exits("error");
 }
 
--- /n/sources/plan9/sys/src/cmd/cfs/inode.c	Sat Jan 10 10:00:05 2015
+++ /sys/src/cmd/cfs/inode.c	Sun Jun 28 00:00:00 2026
@@ -225,8 +225,8 @@ iget(Icache *ic, Qid qid)
 	/*
 	 *  init inode and write to disk
 	 */
-	DPRINT(2, "new file %llud.%ld ino %ld\n",
-		qid.path, qid.vers, m - ic->map);
+	DPRINT(2, "new file %llud.%ld ino %lld\n",
+		qid.path, qid.vers, (vlong)(m - ic->map));
 	b = ialloc(ic, m - ic->map);
 	b->inode.inuse = m->inuse = 1;
 	b->inode.qid = qid;
--- /n/sources/plan9/sys/src/cmd/cifs/netbios.c	Sat Jan 10 10:00:05 2015
+++ /sys/src/cmd/cifs/netbios.c	Sun Jun 28 00:00:00 2026
@@ -465,7 +465,7 @@ Raw:
 	fprint(2, "\n");
 	for(; p < end; p++){
 		if((p - (uchar *)buf) % 16 == 0)
-			fprint(2, "\n%06lx\t", p - (uchar *)buf);
+			fprint(2, "\n%06llx\t", (vlong)(p - (uchar *)buf));
 		if(isprint((char)*p))
 			fprint(2, "%c  ", (char )*p);
 		else
--- /n/sources/plan9/sys/src/cmd/db/setup.c	Sat Jan 10 10:00:05 2015
+++ /sys/src/cmd/db/setup.c	Sun Jun 28 00:00:00 2026
@@ -70,7 +70,6 @@ setcor(void)
 		setmap(cormap, fcor, fhdr.dataddr, 0xffffffff, fhdr.dataddr, "data");
 	}
 	kmsys();
-	return;
 }
 
 Map *
@@ -192,10 +191,10 @@ attachprocess(void)
 		return;
 	}
 	sym = dirfstat(fsym);
-	sprint(buf, "/proc/%lud/mem", adrval);
+	sprint(buf, "/proc/%llud/mem", (uvlong)adrval);
 	corfil = buf;
 	setcor();
-	sprint(buf, "/proc/%lud/text", adrval);
+	sprint(buf, "/proc/%llud/text", (uvlong)adrval);
 	fd = open(buf, OREAD);
 	mem = nil;
 	if (sym==nil || fd < 0 || (mem=dirfstat(fd))==nil
--- /n/sources/plan9/sys/src/cmd/ip/ppp/mppc.c	Sat Jan 10 10:00:05 2015
+++ /sys/src/cmd/ip/ppp/mppc.c	Sun Jun 28 00:00:00 2026
@@ -851,7 +851,7 @@ netlog("***** unknown protocol\n");
 			return;
 		}
 		p += 2;
-netlog("off = %ld ", p-s->his);
+netlog("off = %lld ", (vlong)(p - s->his));
 		iph = (Iphdr*)p;
 		len = nhgets(iph->length);
 		ipcheck(p, len);
--- /n/sources/plan9/sys/src/cmd/mv.c	Sat Jan 10 10:00:05 2015
+++ /sys/src/cmd/mv.c	Sun Jun 28 00:00:00 2026
@@ -88,8 +88,8 @@ mv1(char *from, Dir *dirb, char *todir, char *toelem)
 	}
 	j = strlen(todir);
 	if(i + j + 2 > sizeof toname){
-		fprint(2, "mv: path too big (max %d): %s/%s\n",
-			sizeof toname, todir, toelem);
+		fprint(2, "mv: path too big (max %lld): %s/%s\n",
+			(vlong)sizeof toname, todir, toelem);
 		return -1;
 	}
 	memmove(toname, todir, j);
--- /n/sources/plan9/sys/src/cmd/ql/obj.c	Sat Jan 10 10:00:05 2015
+++ /sys/src/cmd/ql/obj.c	Sun Jun 28 00:00:00 2026
@@ -313,8 +313,8 @@ out:
 	if(debug['v']) {
 		Bprint(&bso, "%5.2f cpu time\n", cputime());
 		Bprint(&bso, "%ld memory used\n", tothunk);
-		Bprint(&bso, "%d sizeof adr\n", sizeof(Adr));
-		Bprint(&bso, "%d sizeof prog\n", sizeof(Prog));
+		Bprint(&bso, "%lld sizeof adr\n", (vlong)sizeof(Adr));
+		Bprint(&bso, "%lld sizeof prog\n", (vlong)sizeof(Prog));
 	}
 	errorexit();
 }
--- /n/sources/plan9/sys/src/cmd/seconds.c	Sat Jan 10 10:00:05 2015
+++ /sys/src/cmd/seconds.c	Sun Jun 28 00:00:00 2026
@@ -6,8 +6,6 @@
 #include <libc.h>
 #include <ctype.h>
 
-typedef ulong Time;
-
 enum {
 	AM, PM, HR24,
 
@@ -208,7 +206,7 @@ validtm(Tm *tm)
 	return 1;
 }
 
-Time
+uvlong
 seconds(char *timestr)
 {
 	Tm date;
@@ -216,6 +214,7 @@ seconds(char *timestr)
 	memset(&date, 0, sizeof date);
 	if (prsabsdate(timestr, localtime(time(0)), &date) < 0)
 		return -1;
+	/* a uvlong version of tm2sec would work here, without the 2106 check */
 	return validtm(&date)? tm2sec(&date): -1;
 }
 
@@ -223,18 +222,19 @@ int
 convert(char *timestr)
 {
 	char *copy;
-	Time tstime;
+	uvlong tstime;
 
 	copy = strdup(timestr);
 	if (copy == nil)
 		sysfatal("out of memory");
 	tstime = seconds(copy);
 	free(copy);
-	if (tstime == -1) {
-		fprint(2, "%s: `%s' not a valid date\n", argv0, timestr);
+	if (tstime == (uvlong)-1) {
+		fprint(2, "%s: `%s' not a valid unix-era date\n",
+			argv0, timestr);
 		return 1;
 	}
-	print("%lud\n", tstime);
+	print("%llud\n", tstime);
 	return 0;
 }
 
--- /n/sources/plan9/sys/src/cmd/tcs/tcs.c	Sat Jan 10 10:00:05 2015
+++ /sys/src/cmd/tcs/tcs.c	Sun Jun 28 00:00:00 2026
@@ -356,7 +356,9 @@ intable(int fd, long *table, struct convert *out)
 			c = table[*p];
 			if(c < 0){
 				if(squawk)
-					EPR "%s: bad char 0x%x near byte %ld in %s\n", argv0, *p, ninput+(p-e), file);
+					EPR "%s: bad char 0x%x near byte %lld in %s\n",
+						argv0, *p,
+						(uvlong)ninput+(p-e), file);
 				nerrors++;
 				if(clean)
 					continue;