diff --git a/ChangeLog b/ChangeLog
index 87a4e13..98d87bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Aug  5 10:49:57 CDT 2005	Jeff Smith <whydoubt@yahoo.com>
+	* include/mdbtools.h:
+	* src/libmdb/iconv.h: Use size_t instead of unsigned int for calling iconv
+
 Sat Jul  2 02:12:39 CDT 2005	Jeff Smith <whydoubt@yahoo.com>
 	* include/mdbtools.h:
 	* src/libmdb/data.c:
diff --git a/include/mdbtools.h b/include/mdbtools.h
index 65e39d7..1264300 100644
--- a/include/mdbtools.h
+++ b/include/mdbtools.h
@@ -528,8 +528,8 @@ extern int mdb_get_option(unsigned long optnum);
 extern void mdb_debug(int klass, char *fmt, ...);
 
 /* iconv.c */
-extern int mdb_unicode2ascii(MdbHandle *mdb, char *src, unsigned int slen, char *dest, unsigned int dlen);
-extern int mdb_ascii2unicode(MdbHandle *mdb, char *src, unsigned int slen, char *dest, unsigned int dlen);
+extern int mdb_unicode2ascii(MdbHandle *mdb, char *src, size_t slen, char *dest, size_t dlen);
+extern int mdb_ascii2unicode(MdbHandle *mdb, char *src, size_t slen, char *dest, size_t dlen);
 extern void mdb_iconv_init(MdbHandle *mdb);
 extern void mdb_iconv_close(MdbHandle *mdb);
 
diff --git a/src/libmdb/iconv.c b/src/libmdb/iconv.c
index 55ebe0c..a6edd45 100644
--- a/src/libmdb/iconv.c
+++ b/src/libmdb/iconv.c
@@ -28,11 +28,11 @@
  * This function is used in reading text data from an MDB table.
  */
 int
-mdb_unicode2ascii(MdbHandle *mdb, char *src, unsigned int slen, char *dest, unsigned int dlen)
+mdb_unicode2ascii(MdbHandle *mdb, char *src, size_t slen, char *dest, size_t dlen)
 {
 	char *tmp = NULL;
-	unsigned int tlen = 0;
-	unsigned int len_in, len_out;
+	size_t tlen = 0;
+	size_t len_in, len_out;
 	char *in_ptr, *out_ptr;
 
 	if ((!src) || (!dest) || (!dlen))
@@ -104,7 +104,7 @@ mdb_unicode2ascii(MdbHandle *mdb, char *src, unsigned int slen, char *dest, unsi
  * If slen is 0, strlen will be used to calculate src's length.
  */
 int
-mdb_ascii2unicode(MdbHandle *mdb, char *src, unsigned int slen, char *dest, unsigned int dlen)
+mdb_ascii2unicode(MdbHandle *mdb, char *src, size_t slen, char *dest, size_t dlen)
 {
         size_t len_in, len_out;
         char *in_ptr, *out_ptr;
@@ -180,10 +180,10 @@ mdb_ascii2unicode(MdbHandle *mdb, char *src, unsigned int slen, char *dest, unsi
 
 void mdb_iconv_init(MdbHandle *mdb)
 {
-	char *iconv_code;
+	const char *iconv_code;
 
 	/* check environment variable */
-	if (!(iconv_code=(char *)getenv("MDB_ICONV"))) {
+	if (!(iconv_code=getenv("MDB_ICONV"))) {
 		iconv_code="UTF-8";
 	}
 
@@ -194,10 +194,10 @@ void mdb_iconv_init(MdbHandle *mdb)
         } else {
                 /* According to Microsoft Knowledge Base pages 289525 and */
 		/* 202427, code page info is not contained in the database */
-		char *jet3_iconv_code;
+		const char *jet3_iconv_code;
 
 		/* check environment variable */
-		if (!(jet3_iconv_code=(char *)getenv("MDB_JET3_CHARSET"))) {
+		if (!(jet3_iconv_code=getenv("MDB_JET3_CHARSET"))) {
 			jet3_iconv_code="CP1252";
 		}