diff --git a/src/backend/tcop/Makefile b/src/backend/tcop/Makefile
index 47bdd96909..a40e3e717e 100644
--- a/src/backend/tcop/Makefile
+++ b/src/backend/tcop/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for tcop
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/tcop/Makefile,v 1.8 1996/11/18 02:26:55 bryanh Exp $
+#    $Header: /cvsroot/pgsql/src/backend/tcop/Makefile,v 1.9 1997/03/25 02:35:22 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -24,7 +24,7 @@ ifeq ($(CC), gcc)
 CFLAGS+= -Wno-error
 endif
 
-OBJS= aclchk.o dest.o fastpath.o postgres.o pquery.o utility.o
+OBJS= aclchk.o dest.o fastpath.o postgres.o pquery.o utility.o variable.o
 
 all: SUBSYS.o
 
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 4b3a8630a5..b5ac17f5cf 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.25 1997/03/18 20:15:39 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.26 1997/03/25 02:37:21 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -105,8 +105,12 @@ struct EnvironmentOptions
 	const char *envName, *pgName;
 	} EnvironmentOptions[] =
 	{
-		{ "PG_DATEFORMAT",	"pg_dateformat" },
-		{ "PG_FLOATFORMAT",	"pg_floatformat" },
+		{ "PG_DATE",	"date" },
+		{ "PG_TIME",	"time" },
+		{ "PG_FLOAT",	"float" },
+		{ "PG_LANG",	"language" },
+		{ "PG_TZONE",	"timezone" },
+		{ "PG_MONEY",	"money" },
 		{ NULL }
 	};