diff --git a/ChangeLog b/ChangeLog
index 883b502..28d826f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,27 @@ Tue Apr 13 19:08:51 CDT 2004	Jeff Smith <whydoubt@yahoo.com>
 	* src/odbc/Makefile.am: Improve configure for ODBC
 	* acinclude.m4: Update to the latest libtool.m4
 	* src/libmdb/file.c: Make mdb_close free the handle
+	* src/sql/mdbsql.c:
+	* src/util/mdb-array.c:
+	* src/util/mdb-check.c:
+	* src/util/mdb-export.c:
+	* src/util/mdb-header.c:
+	* src/util/mdb-import.c:
+	* src/util/mdb-prop.c:
+	* src/util/mdb-schema.c:
+	* src/util/mdb-tables.c:
+	* src/util/mdb-ver.c:
+	* src/util/prcat.c:
+	* src/util/prdata.c:
+	* src/util/prdump.c:
+	* src/util/prfreemap.c:
+	* src/util/prindex.c:
+	* src/util/prkkd.c:
+	* src/util/prole.c:
+	* src/util/prtable.c:
+	* src/util/sargtest.c:
+	* src/util/updrow.c: Use mdb_close to match mdb_open instead of
+	                     mdb_free_handle
 
 Tue Apr 13 15:25:26 EDT 2004	Brian Bruns <brian@bruns.com>
 	* include/mdbtools.h:
diff --git a/src/sql/mdbsql.c b/src/sql/mdbsql.c
index e215ec5..b30d030 100644
--- a/src/sql/mdbsql.c
+++ b/src/sql/mdbsql.c
@@ -130,7 +130,6 @@ mdb_sql_close(MdbSQL *sql)
 {
 	if (sql->mdb) {
 		mdb_close(sql->mdb);
-		mdb_free_handle(sql->mdb);
 		sql->mdb = NULL;
 	} else {
 		mdb_sql_error("Not connected.");
@@ -460,7 +459,6 @@ MdbSQLTable *t;
 	g_ptr_array_free(sql->tables,TRUE);
 	if (sql->mdb) {
 		mdb_close(sql->mdb);	
-		mdb_free_handle(sql->mdb);	
 	}
 }
 void mdb_sql_reset(MdbSQL *sql)
diff --git a/src/util/mdb-array.c b/src/util/mdb-array.c
index 177421c..89298d7 100644
--- a/src/util/mdb-array.c
+++ b/src/util/mdb-array.c
@@ -123,7 +123,7 @@ int started;
        }
    }
  
- mdb_free_handle (mdb);
+ mdb_close (mdb);
  mdb_exit();
 
  fprintf (stdout, "\n};\n");
diff --git a/src/util/mdb-check.c b/src/util/mdb-check.c
index a6ceed7..90d2aec 100644
--- a/src/util/mdb-check.c
+++ b/src/util/mdb-check.c
@@ -101,7 +101,7 @@ int opt;
 	}
    }
 
-	mdb_free_handle (mdb);
+	mdb_close (mdb);
 	mdb_exit();
 
 	exit(0);
diff --git a/src/util/mdb-export.c b/src/util/mdb-export.c
index 8df3e85..ef04852 100644
--- a/src/util/mdb-export.c
+++ b/src/util/mdb-export.c
@@ -198,7 +198,6 @@ main(int argc, char **argv)
 	}
 
 	mdb_close(mdb);
-	mdb_free_handle(mdb);
 	mdb_exit();
 
 	exit(0);
diff --git a/src/util/mdb-header.c b/src/util/mdb-header.c
index 0b63da5..889802f 100644
--- a/src/util/mdb-header.c
+++ b/src/util/mdb-header.c
@@ -153,7 +153,7 @@ FILE *cfile;
  fclose (typesfile);
  fclose (cfile);
  
- mdb_free_handle (mdb);
+ mdb_close (mdb);
  mdb_exit();
 
  exit(0);
diff --git a/src/util/mdb-import.c b/src/util/mdb-import.c
index 108b34d..8836623 100644
--- a/src/util/mdb-import.c
+++ b/src/util/mdb-import.c
@@ -237,7 +237,7 @@ main(int argc, char **argv)
 	}
 
 	fclose(in);
-	mdb_free_handle(mdb);
+	mdb_close(mdb);
 	mdb_exit();
 
 	exit(0);
diff --git a/src/util/mdb-prop.c b/src/util/mdb-prop.c
index efc4d35..20e9bf0 100644
--- a/src/util/mdb-prop.c
+++ b/src/util/mdb-prop.c
@@ -89,7 +89,7 @@ main(int argc, char **argv)
 		}
 	}
 
-	mdb_free_handle(mdb);
+	mdb_close(mdb);
 	mdb_exit();
 
 	exit(0);
diff --git a/src/util/mdb-schema.c b/src/util/mdb-schema.c
index 75b241e..411f343 100644
--- a/src/util/mdb-schema.c
+++ b/src/util/mdb-schema.c
@@ -120,7 +120,7 @@ main (int argc, char **argv)
 	}            
  
 
-	mdb_free_handle (mdb);
+	mdb_close (mdb);
 	mdb_exit();
 
 	exit(0);
diff --git a/src/util/mdb-tables.c b/src/util/mdb-tables.c
index 045623e..b90e4e9 100644
--- a/src/util/mdb-tables.c
+++ b/src/util/mdb-tables.c
@@ -91,7 +91,6 @@ int opt;
 		fprintf (stdout, "\n");
  
 	mdb_close(mdb);
-	mdb_free_handle(mdb);
 	mdb_exit();
 	if (delimiter) free(delimiter);
 
diff --git a/src/util/mdb-ver.c b/src/util/mdb-ver.c
index 8acc514..48950ab 100644
--- a/src/util/mdb-ver.c
+++ b/src/util/mdb-ver.c
@@ -74,7 +74,7 @@ main(int argc, char **argv)
 		printf(_("unknown database version\n"));
 	}
 	
-	mdb_free_handle(mdb);
+	mdb_close(mdb);
 	mdb_exit();
 
 	exit(0);
diff --git a/src/util/prcat.c b/src/util/prcat.c
index b8c0489..62893d9 100644
--- a/src/util/prcat.c
+++ b/src/util/prcat.c
@@ -35,7 +35,7 @@ main(int argc, char **argv)
 
 	mdb_dump_catalog(mdb,(argc > 2) ? atoi(argv[2]) : MDB_TABLE); 
 
-	mdb_free_handle(mdb);
+	mdb_close(mdb);
 	mdb_exit();
 
 	exit(0);
diff --git a/src/util/prdata.c b/src/util/prdata.c
index 1312415..e3a8eb5 100644
--- a/src/util/prdata.c
+++ b/src/util/prdata.c
@@ -48,7 +48,7 @@ MdbTableDef *table;
 		}
 	}
 
-	mdb_free_handle(mdb);
+	mdb_close(mdb);
 	mdb_exit();
 
 	exit(0);
diff --git a/src/util/prdump.c b/src/util/prdump.c
index 3e24bf9..f94bb4e 100644
--- a/src/util/prdump.c
+++ b/src/util/prdump.c
@@ -46,7 +46,7 @@ int page, start, stop;
 	    fprintf (stderr, "%4x %4x %c\n", j, mdb->pg_buf [j], mdb->pg_buf [j]);
 	  }
 
-	mdb_free_handle(mdb);
+	mdb_close(mdb);
 	mdb_exit();
 
 	exit(0);
diff --git a/src/util/prfreemap.c b/src/util/prfreemap.c
index 5f9694a..4adc8cd 100644
--- a/src/util/prfreemap.c
+++ b/src/util/prfreemap.c
@@ -58,7 +58,7 @@ unsigned char *map_buf;
 	}
 	if (coln!=1) printf("\n");
 
-	mdb_free_handle(mdb);
+	mdb_close(mdb);
 	mdb_exit();
 
 	exit(0);
diff --git a/src/util/prindex.c b/src/util/prindex.c
index 20e3bb4..fd55118 100644
--- a/src/util/prindex.c
+++ b/src/util/prindex.c
@@ -70,7 +70,7 @@ int found = 0;
 	if (!found) {
 		fprintf(stderr,"No table named %s found.\n", argv[2]);
 	}
-	mdb_free_handle(mdb);
+	mdb_close(mdb);
 	mdb_exit();
 
 	exit(0);
diff --git a/src/util/prkkd.c b/src/util/prkkd.c
index 1cd05ff..112ca26 100644
--- a/src/util/prkkd.c
+++ b/src/util/prkkd.c
@@ -45,7 +45,7 @@ main(int argc, char **argv)
 		}
 	}
 
-	mdb_free_handle(mdb);
+	mdb_close(mdb);
 	mdb_exit();
 #endif
 
diff --git a/src/util/prole.c b/src/util/prole.c
index d1c1ecc..ea0e004 100644
--- a/src/util/prole.c
+++ b/src/util/prole.c
@@ -63,7 +63,7 @@ char *sargname = NULL;
 		}
 	}
 
-	mdb_free_handle(mdb);
+	mdb_close(mdb);
 	mdb_exit();
 
 	exit(0);
diff --git a/src/util/prtable.c b/src/util/prtable.c
index 23855ee..5ba7c0b 100644
--- a/src/util/prtable.c
+++ b/src/util/prtable.c
@@ -51,7 +51,7 @@ int found = 0;
 	if (!found) {
 		fprintf(stderr,"No table named %s found.\n", argv[2]);
 	}
-	mdb_free_handle(mdb);
+	mdb_close(mdb);
 	mdb_exit();
 
 	exit(0);
diff --git a/src/util/sargtest.c b/src/util/sargtest.c
index 915dd11..7ae842f 100644
--- a/src/util/sargtest.c
+++ b/src/util/sargtest.c
@@ -52,7 +52,7 @@ MdbTableDef *table;
 		}
 	}
 
-	mdb_free_handle(mdb);
+	mdb_close(mdb);
 	mdb_exit();
 
 	exit(0);
diff --git a/src/util/updrow.c b/src/util/updrow.c
index ca428ca..e409d84 100644
--- a/src/util/updrow.c
+++ b/src/util/updrow.c
@@ -70,7 +70,7 @@ int len;
 		}
 	}
 
-	mdb_free_handle(mdb);
+	mdb_close(mdb);
 	mdb_exit();
 
 	exit(0);