diff --git a/doc/src/sgml/libpq++.sgml b/doc/src/sgml/libpq++.sgml
index 8e98cc1f79..2327eb5e26 100644
--- a/doc/src/sgml/libpq++.sgml
+++ b/doc/src/sgml/libpq++.sgml
@@ -174,6 +174,12 @@ sets the default cost for heap searches for the optimizer.
 sets the default cost for indexed searches for the optimizer.
 </Para>
 </ListItem>
+<ListItem>
+<Para>
+<Acronym>PGQUERY_LIMIT</Acronym>
+sets the maximum number of rows returned by a query.
+</Para>
+</ListItem>
 </ItemizedList>
 </Para>
 
@@ -581,4 +587,4 @@ be silently truncated.
 <para>
 The <classname>PGlobj</classname> class is largely untested.  Use with caution.
 
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml
index c38ef7cb29..3038b4a51e 100644
--- a/doc/src/sgml/libpq.sgml
+++ b/doc/src/sgml/libpq.sgml
@@ -1479,6 +1479,12 @@ sets the default cost for heap searches for the optimizer.
 sets the default cost for indexed searches for the optimizer.
 </Para>
 </ListItem>
+<ListItem>
+<Para>
+<Acronym>PGQUERY_LIMIT</Acronym>
+sets the maximum number of rows returned by a query.
+</Para>
+</ListItem>
 </ItemizedList>
 </Para>
 
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 998ced9876..9e5b76bab5 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.85 1998/10/13 20:44:49 scrappy Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.86 1998/10/14 05:31:48 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -142,6 +142,9 @@ static struct EnvironmentOptions
 	{
 		"PGGEQO", "geqo"
 	},
+	{
+		"PGQUERY_LIMIT", "query_limit"
+	},
 	{
 		NULL
 	}
diff --git a/src/man/libpq.3 b/src/man/libpq.3
index d52021a691..fe9720322d 100644
--- a/src/man/libpq.3
+++ b/src/man/libpq.3
@@ -1,6 +1,6 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/libpq.3,v 1.24 1998/08/15 16:36:21 thomas Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/libpq.3,v 1.25 1998/10/14 05:31:50 momjian Exp $
 .TH LIBPQ INTRO 08/08/98 PostgreSQL PostgreSQL
 .SH DESCRIPTION
 Current documentation for this topic is available in the new Programmer's Guide
@@ -106,6 +106,10 @@ sets the default cost for heap searches for the optimizer.
 \(bu
 .B PGCOSTINDEX
 sets the default cost for indexed searches for the optimizer.
+\(bu
+.B PGQUERY_LIMIT
+sets the maximum number of rows returned by a query.
+.sp
 
 .PP
 See the