Index: server/databases/postgresql.xml
===================================================================
--- server/databases/postgresql.xml	(revision ae979ff69a36a11d5ae53e1f7a2f193a53d74219)
+++ server/databases/postgresql.xml	(revision 1a60731f28036c235650b976a95df3622c9ad434)
@@ -7,8 +7,8 @@
   <!ENTITY postgresql-download-http "http://ftp.postgresql.org/pub/source/v&postgresql-version;/postgresql-&postgresql-version;.tar.bz2">
   <!ENTITY postgresql-download-ftp  "ftp://ftp.postgresql.org/pub/source/v&postgresql-version;/postgresql-&postgresql-version;.tar.bz2">
-  <!ENTITY postgresql-md5sum        "2cf30f50099ff1109d0aa517408f8eff">
+  <!ENTITY postgresql-md5sum        "b6369156607a4fd88f21af6fec0f30b9">
   <!ENTITY postgresql-size          "17 MB">
-  <!ENTITY postgresql-buildsize     "191 MB (additional 6 MB to run the testsuite)">
-  <!ENTITY postgresql-time          "1.5 SBU (additional 0.2 SBU to run the testsuite)">
+  <!ENTITY postgresql-buildsize     "194 MB (additional 6 MB to run the testsuite)">
+  <!ENTITY postgresql-time          "1.3 SBU (additional 0.1 SBU to run the testsuite)">
 ]>
 
@@ -34,5 +34,5 @@
     from the Berkeley Postgres database management system.</para>
 
-    &lfs77_checked;
+    &lfs77_checked; &gcc5_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -153,6 +153,6 @@
     database server with the following command:</para>
 
-<screen role="root"><userinput>su - postgres -c '/usr/bin/postmaster -D /srv/pgsql/data > \
-    /srv/pgsql/data/logfile 2&gt;&amp;1 &amp;'</userinput></screen>
+<screen role="root"><userinput>su - postgres -c '/usr/bin/postgres -D /srv/pgsql/data > \
+                  /srv/pgsql/data/logfile 2&gt;&amp;1 &amp;'</userinput></screen>
 
     <para>Still as user <systemitem class="username">root</systemitem>, create
@@ -272,18 +272,25 @@
 
       <seglistitem>
-        <seg>clusterdb, createdb, createlang, createuser, dropdb, droplang,
-        dropuser, ecpg, initdb, pg_basebackup, pg_config, pg_controldata,
-        pg_ctl, pg_dump, pg_dumpall, pg_isready, pg_receivexlog,
-        pg_recvlogical, pg_resetxlog, pg_restore, pltcl_delmod, pltcl_listmod,
-        pltcl_loadmod, postgres, postmaster (symlink), psql, reindexdb,
-        vacuumdb, and optionally (in contrib/) oid2name, pg_archivecleanup,
-        pgbench, pg_standby, pg_test_fsync, pg_test_timing, pg_upgrade,
-        pg_xlogdump, vacuumlo, and many others</seg>
-        <seg>libecpg.{so,a}, libecpg_compat.{so,a}, libpgcommon.a, libpgport.a,
-        libpgtypes.{so,a}, libpq.{so,a}, various charset modules, and
-        optionally programming language modules under /usr/lib/postgresql</seg>
-        <seg>/srv/pgsql, /usr/include/libpq, /usr/include/postgresql,
-        /usr/lib/postgresql, /usr/share/doc/postgresql-&postgresql-version;, and
-        /usr/share/postgresql</seg>
+        <seg>
+          clusterdb, createdb, createlang, createuser, dropdb, droplang,
+          dropuser, ecpg, initdb, pg_basebackup, pg_config, pg_controldata,
+          pg_ctl, pg_dump, pg_dumpall, pg_isready, pg_receivexlog,
+          pg_recvlogical, pg_resetxlog, pg_restore, pltcl_delmod,
+          pltcl_listmod, pltcl_loadmod, postgres, postmaster (deprecated),
+          psql, reindexdb, vacuumdb, and optionally (in contrib/) oid2name,
+          pg_archivecleanup, pgbench, pg_standby, pg_test_fsync,
+          pg_test_timing, pg_upgrade, pg_xlogdump, vacuumlo, and many others
+        </seg>
+        <seg>
+          libecpg.{so,a}, libecpg_compat.{so,a}, libpgcommon.a, libpgport.a,
+          libpgtypes.{so,a}, libpq.{so,a}, various charset modules, and
+          optionally programming language modules under /usr/lib/postgresql
+        </seg>
+        <seg>
+          /usr/include/{libpq,postgresql},
+          /usr/lib/postgresql,
+          /usr/share/{doc/postgresql-9.4.1,postgresql}, and
+          /srv/pgsql
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -626,6 +633,5 @@
         <term><command>postgres</command></term>
         <listitem>
-          <para>is a single user database server, generally used for
-          debugging.</para>
+          <para>is the PostgreSQL database server.</para>
           <indexterm zone="postgresql postgres">
             <primary sortas="b-postgres">postgres</primary>
@@ -637,6 +643,6 @@
         <term><command>postmaster</command></term>
         <listitem>
-          <para>(a symlink to <command>postgres</command>) is a multi-user
-          database daemon.</para>
+          <para>(deprecated, a symlink to <command>postgres</command>) is a
+          multi-user database daemon.</para>
           <indexterm zone="postgresql postmaster">
             <primary sortas="b-postmaster">postmaster</primary>
