diff --git a/builds/posix/Makefile.in.client.gdef b/builds/posix/Makefile.in.client.gdef
index 78fea5dfc5..07b743cb54 100644
--- a/builds/posix/Makefile.in.client.gdef
+++ b/builds/posix/Makefile.in.client.gdef
@@ -27,7 +27,7 @@
 #  Contributor(s):
 # 
 #
-#  $Id: Makefile.in.client.gdef,v 1.5 2003-03-27 11:21:43 aafemt Exp $
+#  $Id: Makefile.in.client.gdef,v 1.6 2003-10-20 01:45:06 brodsom Exp $
 #
 ROOT=..
 ObjModuleName=client.gdef
@@ -51,7 +51,19 @@ GDEF_Files=	exe.epp extract.epp \
 GDEF_Sources = $(addprefix dudley/, $(GDEF_Files))
 GDEF_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(GDEF_Sources))))
 
-AllObjects = $(GDEF_Objects)
+WALF_Files= walf.cpp
+WALF_Sources = $(addprefix wal/, $(WALF_Files))
+WALF_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(WALF_Sources))))
+
+JRD_Files= iberr.cpp isc.cpp isc_file.cpp llio.cpp misc.cpp status.cpp
+JRD_Sources = $(addprefix jrd/, $(JRD_Files))
+JRD_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(JRD_Sources))))
+
+GPRE_Files= pretty.cpp
+GPRE_Sources = $(addprefix gpre/, $(GPRE_Files))
+GPRE_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(GPRE_Sources))))
+
+AllObjects = $(GDEF_Objects) $(WALF_Objects) $(JRD_Objects) $(GPRE_Objects)
 Dependencies = $(AllObjects:.o=.d)
 
 
@@ -61,8 +73,8 @@ all:	gdef
 
 gdef:   $(BIN)/gdef
 
-$(BIN)/gdef: $(GDEF_Objects) $(LIBFBCLIENT_SO)  
-	$(LD) $(LINK_OPTS) $(GDEF_Objects) -o $@ -L$(LIB) -lfbclient $(LINK_LIBS)
+$(BIN)/gdef: $(GDEF_Objects) $(WALF_Objects) $(JRD_Objects) $(GPRE_Objects) $(LIBFBCLIENT_SO)  
+	$(LD) $(LINK_OPTS) $(GDEF_Objects) $(WALF_Objects) $(JRD_Objects) $(GPRE_Objects) -o $@ -L$(LIB) -lfbclient $(LINK_LIBS)
 
 
 
diff --git a/builds/posix/Makefile.in.client.qli b/builds/posix/Makefile.in.client.qli
new file mode 100644
index 0000000000..fac96f9d14
--- /dev/null
+++ b/builds/posix/Makefile.in.client.qli
@@ -0,0 +1,95 @@
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+# You may obtain a copy of the Licence at
+# http://www.gnu.org/licences/lgpl.html
+# 
+# As a special exception this file can also be included in modules
+# with other source code as long as that source code has been 
+# released under an Open Source Initiative certificed licence.  
+# More information about OSI certification can be found at: 
+# http://www.opensource.org 
+# 
+# This module is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public Licence for more details.
+# 
+# This module was created by members of the firebird development 
+# team.  All individual contributions remain the Copyright (C) of 
+# those individuals and all rights are reserved.  Contributors to 
+# this file are either listed below or can be obtained from a CVS 
+# history command.
+#
+#  Created by:  Mark O'Donohue <mark.odonohue@ludwig.edu.au>
+#
+#  Contributor(s):
+# 
+#
+#  $Id: Makefile.in.client.qli,v 1.1 2003-10-20 01:44:59 brodsom Exp $
+#
+ROOT=..
+ObjModuleName=client.qli
+
+include     $(ROOT)/gen/make.defaults
+include     $(ROOT)/gen/make.platform
+include     $(ROOT)/gen/make.rules
+include     $(ROOT)/gen/make.shared.variables
+
+@SET_MAKE@
+
+
+QLI_Files=	all.cpp command.cpp compile.cpp dtr.cpp err.cpp eval.cpp \
+		expand.cpp exe.cpp format.cpp gener.cpp help.cpp \
+		hsh.cpp lex.cpp meta.cpp mov.cpp parse.cpp picstr.cpp proc.cpp \
+		report.cpp show.cpp
+QLI_Sources = $(addprefix qli/, $(QLI_Files))
+QLI_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(QLI_Sources))))
+
+WALF_Files= walf.cpp
+WALF_Sources = $(addprefix wal/, $(WALF_Files))
+WALF_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(WALF_Sources))))
+
+JRD_Files= iberr.cpp isc.cpp isc_file.cpp llio.cpp misc.cpp status.cpp
+JRD_Sources = $(addprefix jrd/, $(JRD_Files))
+JRD_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(JRD_Sources))))
+
+GPRE_Files= pretty.cpp
+GPRE_Sources = $(addprefix gpre/, $(GPRE_Files))
+GPRE_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(GPRE_Sources))))
+
+AllObjects = $(QLI_Objects) $(WALF_Objects) $(JRD_Objects) $(GPRE_Objects)
+Dependencies = $(AllObjects:.o=.d)
+
+
+
+.PHONY: all qli
+
+all:	qli   
+
+
+qli : create_yachts $(LIBFBCLIENT_SO) $(QLI)
+
+$(QLI): $(QLI_Objects) $(WALF_Objects) $(JRD_Objects) $(GPRE_Objects)
+	$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbclient $(LINK_LIBS)
+	$(CHMOD_S7) $@
+
+# EKU: At this point yachts.lnk is a link to empty.fdb, but gpre will fail
+#      with it. metadata.fdb is what is needed here.
+create_yachts:
+	-$(RM) yachts.lnk
+	-$(LN) -f metadata.fdb yachts.lnk
+
+
+# qli_help
+#
+# qli_help is now directly build in the refDatabase directory, and doesn't 
+# need to be rebuilt here.
+
+
+
+include $(ROOT)/gen/make.shared.targets
+
+-include $(Dependencies)
+
diff --git a/builds/posix/Makefile.in.firebird b/builds/posix/Makefile.in.firebird
index 95f689b5c6..e2c341e58b 100644
--- a/builds/posix/Makefile.in.firebird
+++ b/builds/posix/Makefile.in.firebird
@@ -27,7 +27,7 @@
 #  Contributor(s):
 # 
 #
-#  $Id: Makefile.in.firebird,v 1.46 2003-09-27 23:29:07 brodsom Exp $
+#  $Id: Makefile.in.firebird,v 1.47 2003-10-20 01:45:01 brodsom Exp $
 #
 
 ROOT=..
@@ -374,7 +374,7 @@ embed_fbudf:
 .PHONY: libfbclient client_gfix client_gbak client_isql client_gpre client_util client_fbudf
 
 super_targets: libfbserver fbserver libfbclient client_gfix client_gbak \
-			client_isql client_gpre client_util client_fbudf # client_gdef
+			client_isql client_gpre client_util client_fbudf client_gdef client_qli
 
 libfbserver:
 	$(MAKE) -f $(GEN_ROOT)/Makefile.libfbserver $@
@@ -409,6 +409,9 @@ client_fbudf:
 client_gdef:
 	$(MAKE) -f $(GEN_ROOT)/Makefile.client.gdef
 
+client_qli:
+	$(MAKE) -f $(GEN_ROOT)/Makefile.client.qli
+
 
 #sysdba_user gstat:			# add sysdba user and build gstat program
 #	$(MAKE) -C utilities $@
diff --git a/configure.in b/configure.in
index 9f315f2887..8026d732e1 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.162 2003-10-19 06:59:55 stryqx Exp $
+dnl $Id: configure.in,v 1.163 2003-10-20 01:44:00 brodsom Exp $
 
 dnl ############################# INITIALISATION ###############################
 
@@ -613,6 +613,13 @@ mkdir -p temp/client.gbak/burp
 mkdir -p temp/client.gfix/alice
 mkdir -p temp/client.gpre/gpre
 mkdir -p temp/client.gdef/dudley
+mkdir -p temp/client.gdef/wal
+mkdir -p temp/client.gdef/gpre
+mkdir -p temp/client.gdef/jrd
+mkdir -p temp/client.qli/qli
+mkdir -p temp/client.qli/wal
+mkdir -p temp/client.qli/jrd
+mkdir -p temp/client.qli/gpre
 mkdir -p temp/client.isql/isql
 mkdir -p temp/client.util/utilities/rebuild
 mkdir -p temp/client.util/utilities/ibmgr
@@ -755,6 +762,7 @@ gen/Makefile.client.fbudf:${MAKE_SRC_DIR}/Makefile.in.client.fbudf
 gen/Makefile.client.gbak:${MAKE_SRC_DIR}/Makefile.in.client.gbak
 gen/Makefile.client.gfix:${MAKE_SRC_DIR}/Makefile.in.client.gfix
 gen/Makefile.client.gdef:${MAKE_SRC_DIR}/Makefile.in.client.gdef
+gen/Makefile.client.qli:${MAKE_SRC_DIR}/Makefile.in.client.qli
 gen/Makefile.client.isql:${MAKE_SRC_DIR}/Makefile.in.client.isql
 gen/Makefile.client.gpre:${MAKE_SRC_DIR}/Makefile.in.client.gpre
 gen/Makefile.client.util:${MAKE_SRC_DIR}/Makefile.in.client.util