diff --git a/ChangeLog b/ChangeLog
index 905df32..20be07d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@ Fri Jul  2 23:52:34 CDT 2004	Jeff Smith <whydoubt@yahoo.com>
 	* src/libmdb/iconv.c:
 	* src/libmdb/index.c:
 	* include/mdbtools.h: Fixes based on 'gcc -W -Wall' warnings
+	* src/libmdb/file.c:
+	* src/libmdb/write.c:
+	* include/mdbtools.h: Replace size_t with ssize_t as appropriate
 
 Fri Jul  2 07:27:32 CDT 2004	Jeff Smith <whydoubt@yahoo.com>
 	* src/libmdb/backend.c:
diff --git a/include/mdbtools.h b/include/mdbtools.h
index 0c824f4..b0befcc 100644
--- a/include/mdbtools.h
+++ b/include/mdbtools.h
@@ -384,8 +384,8 @@ extern void mdb_init();
 extern void mdb_exit();
 
 /* file.c */
-extern size_t mdb_read_pg(MdbHandle *mdb, unsigned long pg);
-extern size_t mdb_read_alt_pg(MdbHandle *mdb, unsigned long pg);
+extern ssize_t mdb_read_pg(MdbHandle *mdb, unsigned long pg);
+extern ssize_t mdb_read_alt_pg(MdbHandle *mdb, unsigned long pg);
 extern unsigned char mdb_get_byte(unsigned char *buf, int offset);
 extern int    mdb_get_int16(unsigned char *buf, int offset);
 extern gint32   mdb_get_int24(unsigned char *buf, int offset);
diff --git a/src/libmdb/file.c b/src/libmdb/file.c
index 0555ca5..2dbacce 100644
--- a/src/libmdb/file.c
+++ b/src/libmdb/file.c
@@ -52,7 +52,7 @@ MdbFormatConstants MdbJet3Constants = {
 	2048, 0x08, 12, 25, 27, 31, 35, 36, 43, 8, 13, 16, 1, 18, 39, 3, 14, 5 /* not sure on 5, need to check */
 };
 
-static size_t _mdb_read_pg(MdbHandle *mdb, unsigned char *pg_buf, unsigned long pg);
+static ssize_t _mdb_read_pg(MdbHandle *mdb, unsigned char *pg_buf, unsigned long pg);
 
 /**
  * mdb_find_file:
@@ -217,9 +217,9 @@ MdbHandle *mdb_clone_handle(MdbHandle *mdb)
 /* 
 ** mdb_read a wrapper for read that bails if anything is wrong 
 */
-size_t mdb_read_pg(MdbHandle *mdb, unsigned long pg)
+ssize_t mdb_read_pg(MdbHandle *mdb, unsigned long pg)
 {
-size_t len;
+	ssize_t len;
 
 	if (pg && mdb->cur_pg == pg) return mdb->fmt->pg_size;
 
@@ -230,18 +230,18 @@ size_t len;
 	mdb->cur_pos = 0; /* kan */
 	return len;
 }
-size_t mdb_read_alt_pg(MdbHandle *mdb, unsigned long pg)
+ssize_t mdb_read_alt_pg(MdbHandle *mdb, unsigned long pg)
 {
-size_t len;
+	ssize_t len;
 
 	len = _mdb_read_pg(mdb, mdb->alt_pg_buf, pg);
 	return len;
 }
-static size_t _mdb_read_pg(MdbHandle *mdb, unsigned char *pg_buf, unsigned long pg)
+static ssize_t _mdb_read_pg(MdbHandle *mdb, unsigned char *pg_buf, unsigned long pg)
 {
-size_t len;
-struct stat status;
-off_t offset = pg * mdb->fmt->pg_size;
+	ssize_t len;
+	struct stat status;
+	off_t offset = pg * mdb->fmt->pg_size;
 
         fstat(mdb->f->fd, &status);
         if (status.st_size < offset) { 
diff --git a/src/libmdb/write.c b/src/libmdb/write.c
index c7a2727..38fc2a8 100644
--- a/src/libmdb/write.c
+++ b/src/libmdb/write.c
@@ -47,12 +47,12 @@ _mdb_put_int32(unsigned char *buf, guint32 offset, guint32 value)
 	value /= 256;
 	buf[offset+3] = value % 256;
 }
-size_t
+ssize_t
 mdb_write_pg(MdbHandle *mdb, unsigned long pg)
 {
-size_t len;
-struct stat status;
-off_t offset = pg * mdb->fmt->pg_size;
+	ssize_t len;
+	struct stat status;
+	off_t offset = pg * mdb->fmt->pg_size;
 
 	fstat(mdb->f->fd, &status);
 	/* is page beyond current size + 1 ? */