diff --git a/doc/src/sgml/start.sgml b/doc/src/sgml/start.sgml
index 5861500984..12390f04db 100644
--- a/doc/src/sgml/start.sgml
+++ b/doc/src/sgml/start.sgml
@@ -226,7 +226,7 @@ running the <ProductName>Postgres</ProductName>  terminal  monitor  programs
         library.   This  allows  you  to submit <Acronym>SQL</Acronym> commands
         from <Acronym>C</Acronym> and get answers and status messages  back  to
         your  program.   This interface is discussed further
-        in <xref linkend="libpq" endterm="libpq">.
+        in <citetitle>The PostgreSQL Programmer's Guide</citetitle>.
 </Para>
 </ListItem>
 </ItemizedList>
@@ -274,7 +274,8 @@ mydb=> \g
 
      This  tells  the  server  to process the query.  If you
      terminate your query with a semicolon, the  <Quote>\g</Quote> is  not
-     necessary.   <Application>psql</Application> will automatically process semicolon terminated queries.
+     necessary.
+     <Application>psql</Application> will automatically process semicolon terminated queries.
      To read queries from a file,  say  myFile,  instead  of
      entering them interactively, type:
 <ProgramListing>
@@ -314,3 +315,20 @@ mydb=> \q
 </Sect1>
 
 </Chapter>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:"./reference.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:"/usr/lib/sgml/CATALOG"
+sgml-local-ecat-files:nil
+End:
+-->
diff --git a/doc/src/sgml/tutorial.sgml b/doc/src/sgml/tutorial.sgml
index 5873a37772..3cedf0aefa 100644
--- a/doc/src/sgml/tutorial.sgml
+++ b/doc/src/sgml/tutorial.sgml
@@ -5,6 +5,14 @@
 -
 - -->
 <!doctype book PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
+
+<!entity about    SYSTEM "about.sgml">
+<!entity history  SYSTEM "history.sgml">
+<!entity info     SYSTEM "info.sgml">
+<!entity legal    SYSTEM "legal.sgml">
+<!entity notation SYSTEM "notation.sgml">
+<!entity y2k      SYSTEM "y2k.sgml">
+
 <!entity intro    SYSTEM "intro.sgml">
 <!entity arch     SYSTEM "arch.sgml">
 <!entity start    SYSTEM "start.sgml">