diff --git a/configure.in b/configure.in
index 2b38c7c..636f87e 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(src/extras/mdb-dump.c)
-AM_INIT_AUTOMAKE(mdbtools,0.5)
+AM_INIT_AUTOMAKE(mdbtools,0.6pre1)
 AM_CONFIG_HEADER(include/config.h)
 
 AC_PROG_CC(gcc)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 9a368c5..acaa43b 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,14 +1,14 @@
 # Converting DocBook to HTML (several small files)
 # http://www.freebsd.org/tutorials/docproj-primer/x3132.html#AEN3140
-# version: $Id: Makefile.am,v 1.3 2003/01/14 17:37:19 brianb Exp $
+# version: $Id: Makefile.am,v 1.4 2004/02/09 03:09:53 brianb Exp $
 SHELL = /bin/sh
 TXT2MAN = $(srcdir)/txt2man
 RELEASE = 0.5
 PRODUCT = MDBTools
 
-man_MANS	= mdb-tables.1 mdb-ver.1 mdb-export.1 mdb-schema.1 mdb-sql.1
+dist_man_MANS	= mdb-tables.1 mdb-ver.1 mdb-export.1 mdb-schema.1 mdb-sql.1
 
-EXTRA_DIST	= mdb-tables.txt mdb-ver.txt mdb-export.txt mdb-schema.txt mdb-sql.txt faq.html txt2man
+EXTRA_DIST	= mdb-tables.txt mdb-ver.txt mdb-export.txt mdb-schema.txt mdb-sql.txt faq.html txt2man install.sgml
 
 html:	install.tgz
 
diff --git a/include/Makefile.am b/include/Makefile.am
index 25e5397..eebcbcd 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1 +1 @@
-include_HEADERS	=	mdbtools.h mdbsql.h mdbodbc.h
+include_HEADERS	=	mdbtools.h mdbsql.h mdbodbc.h mdbprivate.h
diff --git a/src/extras/Makefile.am b/src/extras/Makefile.am
index 0d86da2..e87bcf5 100644
--- a/src/extras/Makefile.am
+++ b/src/extras/Makefile.am
@@ -1,5 +1,6 @@
 bin_PROGRAMS	=	mdb-dump
 mdb_dump_SOURCES = mdb-dump.c mdbsupport.c
-INCLUDES	=	-I$(top_srcdir)/include $(GLIB_CFLAGS)
+EXTRA_DIST = mdbsupport.h
+AM_CPPFLAGS	=	-I$(top_srcdir)/include $(GLIB_CFLAGS)
 LDADD	=	../libmdb/libmdb.la 
 LIBS	=	$(GLIB_LIBS)
diff --git a/src/gmdb2/Makefile.am b/src/gmdb2/Makefile.am
index 1e2da19..88b7699 100644
--- a/src/gmdb2/Makefile.am
+++ b/src/gmdb2/Makefile.am
@@ -3,7 +3,7 @@ bin_PROGRAMS	= gmdb2
 include_HEADERS = gmdb.h
 gmdb2_SOURCES = main2.c file.c util.c table.c query.c module.c macro.c report.c form.c info.c table_def.c table_data.c table_export.c debug.c sql.c schema.c prefs.c
 LIBS =	-rdynamic $(GNOME_LIBS) @LEXLIB@ 
-INCLUDES	=	-I$(top_srcdir)/include \
+AM_CPPFLAGS	=	-I$(top_srcdir)/include \
 	$(GNOME_CFLAGS) \
         -DDATADIR=\""$(datadir)"\"                      \
         -DGMDB_ICONDIR=\""$(datadir)/gmdb/glade/"\"        \
diff --git a/src/gmdb2/help/C/Makefile.am b/src/gmdb2/help/C/Makefile.am
index 54981d1..d3b1d5b 100644
--- a/src/gmdb2/help/C/Makefile.am
+++ b/src/gmdb2/help/C/Makefile.am
@@ -1,5 +1,5 @@
 figs = \
-	figures/gmdb2_window.png
+	figures/gmdb2_window.png \
 	figures/gmdb2_sql_window.png
 docname = gmdb
 lang = C
diff --git a/src/libmdb/Makefile.am b/src/libmdb/Makefile.am
index 6f7b681..8c85e0b 100644
--- a/src/libmdb/Makefile.am
+++ b/src/libmdb/Makefile.am
@@ -1,4 +1,4 @@
 lib_LTLIBRARIES	=	libmdb.la
 libmdb_la_SOURCES=	catalog.c mem.c file.c kkd.c table.c data.c dump.c backend.c money.c sargs.c index.c like.c write.c stats.c map.c props.c worktable.c
-INCLUDES	=	-I$(top_srcdir)/include $(GLIB_CFLAGS)
+AM_CPPFLAGS	=	-I$(top_srcdir)/include $(GLIB_CFLAGS)
 LIBS = $(GLIB_LIBS) -lm
diff --git a/src/libmdb/libmdb.a b/src/libmdb/libmdb.a
deleted file mode 100644
index a27b849..0000000
Binary files a/src/libmdb/libmdb.a and /dev/null differ
diff --git a/src/odbc/Makefile.am b/src/odbc/Makefile.am
index 12db5c5..b40808a 100644
--- a/src/odbc/Makefile.am
+++ b/src/odbc/Makefile.am
@@ -6,7 +6,7 @@ MDBSOURCES     =    backend.c index.c money.c catalog.c kkd.c sargs.c \
 				data.c like.c table.c dump.c file.c mem.c
 bin_PROGRAMS	=	unittest
 lib_LTLIBRARIES	=	libmdbodbc.la
-INCLUDES	=	-I ../../include $(GLIB_CFLAGS)
+AM_CPPFLAGS	=	-I ../../include $(GLIB_CFLAGS)
 libmdbodbc_la_SOURCES=	odbc.c connectparams.c
 libmdbodbc_la_LIBADD=	$(patsubst %, $(SQLDIR)/%, \
 				$(patsubst %.c, %.lo, $(SQLSOURCES))) \
diff --git a/src/sql/Makefile.am b/src/sql/Makefile.am
index 73852c8..9b2419a 100644
--- a/src/sql/Makefile.am
+++ b/src/sql/Makefile.am
@@ -1,6 +1,8 @@
 lib_LTLIBRARIES	=	libmdbsql.la
 libmdbsql_la_SOURCES=	mdbsql.c parser.y lexer.l 
-INCLUDES	=	-I$(top_srcdir)/include $(GLIB_CFLAGS)
+EXTRA_DIST = main.c
+DISTCLEANFILES = parser.c parser.h lexer.c
+AM_CPPFLAGS	=	-I$(top_srcdir)/include $(GLIB_CFLAGS)
 LIBS	=	$(GLIB_LIBS)
 LDADD	=	../libmdb/libmdb.la 
 YACC = @YACC@ -d
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 6923b0c..29330cb 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -1,7 +1,7 @@
 bin_PROGRAMS	=	mdb-export mdb-array mdb-schema mdb-tables mdb-parsecsv mdb-header mdb-sql mdb-ver mdb-prop prtable prcat prdata prkkd prdump prole updrow prindex
 LIBS	=	$(GLIB_LIBS) $(READLINE_LIBS) @LEXLIB@ 
 DEFS = @DEFS@ -DLOCALEDIR=\"$(localedir)\"
-INCLUDES	=	-I$(top_srcdir)/include $(GLIB_CFLAGS)
+AM_CPPFLAGS	=	-I$(top_srcdir)/include $(GLIB_CFLAGS)
 LDADD	=	../libmdb/libmdb.la 
 if SQL
 mdb_sql_LDADD = ../libmdb/libmdb.la ../sql/libmdbsql.la