diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml
index 38eebd0967..5dcab58900 100644
--- a/doc/src/sgml/libpq.sgml
+++ b/doc/src/sgml/libpq.sgml
@@ -442,8 +442,8 @@ short PQfsize(PGresult *res,
           associated with the given field index.
           Field indices start at 0.
 <ProgramListing>
-short PQfmod(PGresult *res,
-             int field_index);
+int PQfmod(PGresult *res,
+           int field_index);
 </ProgramListing>
 </Para>
 </ListItem>
diff --git a/doc/src/sgml/protocol.sgml b/doc/src/sgml/protocol.sgml
index 151ca3cb42..1fd64282a5 100644
--- a/doc/src/sgml/protocol.sgml
+++ b/doc/src/sgml/protocol.sgml
@@ -4,7 +4,7 @@
 <FirstName>Phil</FirstName>
 <Surname>Thompson</Surname>
 </Author>
-<Date>1998-07-07</Date>
+<Date>1998-07-13</Date>
 </DocInfo>
 <Title>Frontend/Backend Protocol</Title>
 
@@ -25,7 +25,10 @@ a way as to still allow connections from earlier versions of frontends, but
 this document does not cover the protocol used by those earlier versions.
 
 <Para>
-This document describes version 2.0 of the protocol.
+This document describes version 2.0 of the protocol, implemented in
+<ProductName>Postgres</ProductName> v6.4 and later.
+
+<Para>
 Higher level features built on this protocol (for example, how <FileName>libpq</FileName> passes
 certain environment variables after the connection is established)
 are covered elsewhere.
@@ -1688,7 +1691,7 @@ RowDescription (B)
 </VarListEntry>
 <VarListEntry>
 <Term>
-		Int16
+		Int32
 </Term>
 <ListItem>
 <Para>
diff --git a/src/interfaces/libpq/fe-exec.c b/src/interfaces/libpq/fe-exec.c
index 0feb26ca31..63bc1a078b 100644
--- a/src/interfaces/libpq/fe-exec.c
+++ b/src/interfaces/libpq/fe-exec.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.59 1998/07/13 16:35:00 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.60 1998/07/14 02:41:25 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1299,7 +1299,7 @@ PQfsize(PGresult *res, int field_num)
 		return 0;
 }
 
-short
+int
 PQfmod(PGresult *res, int field_num)
 {
 	if (!res)
diff --git a/src/interfaces/libpq/libpq-fe.h b/src/interfaces/libpq/libpq-fe.h
index 262f7629e3..5cff4a6317 100644
--- a/src/interfaces/libpq/libpq-fe.h
+++ b/src/interfaces/libpq/libpq-fe.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: libpq-fe.h,v 1.34 1998/07/13 16:35:02 momjian Exp $
+ * $Id: libpq-fe.h,v 1.35 1998/07/14 02:41:25 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -77,7 +77,7 @@ extern		"C"
 	{
 		char	   *name;		/* type name */
 		Oid			typid;		/* type id */
-		short		typlen;	/* type size */
+		short		typlen;		/* type size */
 		int			atttypmod;	/* type-specific modifier info */
 	} PGresAttDesc;
 
@@ -332,7 +332,7 @@ extern		"C"
 	extern int	PQfnumber(PGresult *res, const char *field_name);
 	extern Oid	PQftype(PGresult *res, int field_num);
 	extern short PQfsize(PGresult *res, int field_num);
-	extern short PQfmod(PGresult *res, int field_num);
+	extern int	PQfmod(PGresult *res, int field_num);
 	extern char *PQcmdStatus(PGresult *res);
 	extern const char *PQoidStatus(PGresult *res);
 	extern const char *PQcmdTuples(PGresult *res);
diff --git a/src/man/libpq.3 b/src/man/libpq.3
index 8afe20632c..05d853205e 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.19 1998/07/09 03:30:49 scrappy Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/libpq.3,v 1.20 1998/07/14 02:41:26 momjian Exp $
 .TH LIBPQ INTRO 07/08/98 PostgreSQL PostgreSQL
 .SH DESCRIPTION
 Libpq is the programmer's interface to Postgres.  Libpq is a set of
@@ -309,8 +309,8 @@ returns the type-specific modification data of the field
 associated with the given field index.
 Field indices start at 0.
 .nf
-short PQfmod(PGresult *res,
-             int field_index);
+int PQfmod(PGresult *res,
+           int field_index);
 .fi
 
 .B PQgetvalue