diff --git a/doc/src/sgml/admin.sgml b/doc/src/sgml/admin.sgml
index dbe6c8920e5..4c33426a9d9 100644
--- a/doc/src/sgml/admin.sgml
+++ b/doc/src/sgml/admin.sgml
@@ -1,11 +1,15 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/Attic/admin.sgml,v 1.18 1999/12/06 16:37:11 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/admin.sgml,v 1.19 2000/03/28 14:16:06 thomas Exp $
 
 Postgres Administrator's Guide.
 Derived from postgres.sgml.
 - thomas 1998-10-27
 
 $Log: admin.sgml,v $
+Revision 1.19  2000/03/28 14:16:06  thomas
+Update SGML catalog references to DocBook 3.1 on FreeBSD.
+Matches postgresql.org/hub.org environment.
+
 Revision 1.18  1999/12/06 16:37:11  thomas
 Remove references to PostgreSQL as "public-domain" since that has a
  specific meaning wrt copyright (or lack thereof).
@@ -23,7 +27,7 @@ Clean out duplicate stuff in odbc.sgml resulting from a faulty patch.
 
 -->
 
-<!doctype book PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
+<!doctype book PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
 
 <!entity about     SYSTEM "about.sgml">
 <!entity history   SYSTEM "history.sgml">
diff --git a/doc/src/sgml/postgres.sgml b/doc/src/sgml/postgres.sgml
index d8ab08600a2..e94e561ee8e 100644
--- a/doc/src/sgml/postgres.sgml
+++ b/doc/src/sgml/postgres.sgml
@@ -1,4 +1,4 @@
-<!doctype book PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
+<!doctype book PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
 
 <!entity about    SYSTEM "about.sgml">
 <!entity bug-reporting SYSTEM "bug-reporting.sgml">
diff --git a/doc/src/sgml/programmer.sgml b/doc/src/sgml/programmer.sgml
index 8f26bb4c3ef..c01041fa4bf 100644
--- a/doc/src/sgml/programmer.sgml
+++ b/doc/src/sgml/programmer.sgml
@@ -1,9 +1,13 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/Attic/programmer.sgml,v 1.21 2000/02/02 16:25:04 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/programmer.sgml,v 1.22 2000/03/28 14:16:06 thomas Exp $
 
 Postgres Programmer's Guide.
 
 $Log: programmer.sgml,v $
+Revision 1.22  2000/03/28 14:16:06  thomas
+Update SGML catalog references to DocBook 3.1 on FreeBSD.
+Matches postgresql.org/hub.org environment.
+
 Revision 1.21  2000/02/02 16:25:04  thomas
 Add short chapter in developer's guide on formatting source code.
 
@@ -38,7 +42,7 @@ Make new file current.sgml to hold release info for the current release.
 
 -->
 
-<!doctype book PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
+<!doctype book PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
 
 <!entity about    SYSTEM "about.sgml">
 <!entity history  SYSTEM "history.sgml">
diff --git a/doc/src/sgml/tutorial.sgml b/doc/src/sgml/tutorial.sgml
index 49fe34a04a8..0f1d93e45e3 100644
--- a/doc/src/sgml/tutorial.sgml
+++ b/doc/src/sgml/tutorial.sgml
@@ -4,7 +4,7 @@
 - thomas 1998-02-23
 -
 - -->
-<!doctype book PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
+<!doctype book PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
 
 <!entity about    SYSTEM "about.sgml">
 <!entity history  SYSTEM "history.sgml">
diff --git a/doc/src/sgml/user.sgml b/doc/src/sgml/user.sgml
index 4d75ecbe510..3309737fd73 100644
--- a/doc/src/sgml/user.sgml
+++ b/doc/src/sgml/user.sgml
@@ -1,4 +1,4 @@
-<!doctype book PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
+<!doctype book PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
 
 <!entity about    SYSTEM "about.sgml">
 <!entity bug-reporting SYSTEM "bug-reporting.sgml">