diff --git a/libio/ChangeLog b/libio/ChangeLog
index 9c0c641af9d0..107c09a753f8 100644
--- a/libio/ChangeLog
+++ b/libio/ChangeLog
@@ -1,3 +1,9 @@
+Sun Feb  1 13:08:18 1998  Krister Walfridsson (cato@df.lth.se)
+
+	* dbz/dbz.c (putconf): Handle systems which use "long long" as type
+	for "off_t".
+	* dbz/dbzmain.c (mkfiles): Likewise.
+
 Wed Jan 28 10:27:11 1998  Manfred Hollstein  <manfred@s-direktnet.de>
 
 	* config.shared (FLAGS_TO_PASS): Add gxx_include_dir.
diff --git a/libio/dbz/dbz.c b/libio/dbz/dbz.c
index c7e8444952b0..7489a09d15ae 100644
--- a/libio/dbz/dbz.c
+++ b/libio/dbz/dbz.c
@@ -1198,14 +1198,19 @@ register struct dbzconfig *cp;
 		DEBUG(("fseek failure in putconf\n"));
 		ret = -1;
 	}
-	fprintf(f, "dbz %d %ld %d %c %ld %ld %d %d", dbzversion, cp->tsize,
-				cp->fieldsep, cp->casemap, cp->tagenb,
-				cp->tagmask, cp->tagshift, cp->valuesize);
+	fprintf(f, "dbz %d %ld %d %c %ld %ld %d %d", dbzversion,
+		(long)cp->tsize,
+		cp->fieldsep, cp->casemap, (long)cp->tagenb,
+		(long)cp->tagmask, cp->tagshift,
+		cp->valuesize);
+
 	for (i = 0; i < cp->valuesize; i++)
 		fprintf(f, " %d", cp->bytemap[i]);
 	fprintf(f, "\n");
 	for (i = 0; i < NUSEDS; i++)
-		fprintf(f, "%ld%c", cp->used[i], (i < NUSEDS-1) ? ' ' : '\n');
+		fprintf(f, "%ld%c",
+			(long)cp->used[i], (i < NUSEDS-1) ? ' ' : '\n');
+
 
 	(void) fflush(f);
 	if (ferror(f))
diff --git a/libio/dbz/dbzmain.c b/libio/dbz/dbzmain.c
index 4317a0d08312..a393d6432bdd 100644
--- a/libio/dbz/dbzmain.c
+++ b/libio/dbz/dbzmain.c
@@ -19,7 +19,7 @@
 #define	STREQ(a, b)	(*(a) == *(b) && strcmp((a), (b)) == 0)
 
 #ifndef lint
-static char RCSid[] = "$Header: /egcs/carton/cvsfiles/egcs/./libio/dbz/dbzmain.c,v 1.1 1997/08/21 22:58:23 jason Exp $";
+static char RCSid[] = "$Header: /egcs/carton/cvsfiles/egcs/./libio/dbz/dbzmain.c,v 1.1.1.1 1997/08/21 22:58:23 jason Exp $";
 #endif
 
 char *progname;
@@ -278,7 +278,7 @@ mkfiles()
 	} else if (op == 'b' && dbzint) {
 		if (!exact)
 			siz = dbzsize(siz);
-		if (dbzfresh(my_basename, siz, (int)fs, map, tag) < 0)
+		if (dbzfresh(my_basename, siz, (int)fs, map, (off_t)tag) < 0)
 			fail("dbzfresh(`%s'...) failed", my_basename);
 	} else if (dbminit(my_basename) < 0)
 		fail("dbminit(`%s') failed", my_basename);