diff --git a/GNUmakefile.in b/GNUmakefile.in
index d934b19d95..aa4af2afd2 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,7 +1,7 @@
 #
 # PostgreSQL top level makefile
 #
-# $PostgreSQL: pgsql/GNUmakefile.in,v 1.55 2009/11/03 21:28:10 petere Exp $
+# $PostgreSQL: pgsql/GNUmakefile.in,v 1.56 2010/01/28 23:59:52 adunstan Exp $
 #
 
 subdir =
@@ -14,6 +14,13 @@ all:
 	$(MAKE) -C config all
 	@echo "All of PostgreSQL successfully made. Ready to install."
 
+world:
+	$(MAKE) -C doc html
+	$(MAKE) -C src all
+	$(MAKE) -C config all
+	$(MAKE) -C contrib all
+	@echo "PostgreSQL, contrib and HTML documentation successfully made. Ready to install."
+
 html man:
 	$(MAKE) -C doc $@
 
@@ -23,6 +30,13 @@ install:
 	$(MAKE) -C config $@
 	@echo "PostgreSQL installation complete."
 
+install-world:
+	$(MAKE) -C doc install
+	$(MAKE) -C src install
+	$(MAKE) -C config install
+	$(MAKE) -C contrib install
+	@echo "PostgreSQL and contrib installation complete."
+
 installdirs uninstall coverage:
 	$(MAKE) -C doc $@
 	$(MAKE) -C src $@
@@ -60,6 +74,12 @@ check: all
 check installcheck installcheck-parallel:
 	$(MAKE) -C src/test $@
 
+installcheck-world:
+	$(MAKE) -C src/test installcheck
+	$(MAKE) -C src/pl installcheck
+	$(MAKE) -C interfaces/ecpg installcheck
+	$(MAKE) -C contrib installcheck
+
 GNUmakefile: GNUmakefile.in $(top_builddir)/config.status
 	./config.status $@
 
diff --git a/Makefile b/Makefile
index bbf5de05a6..b5b2ea54c0 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@
 # GNUmakefile won't exist yet, so we catch that case as well.
 
 
-all check install installdirs installcheck installcheck-parallel uninstall clean distclean maintainer-clean dist distcheck:
+all check install installdirs installcheck installcheck-parallel uninstall clean distclean maintainer-clean dist distcheck world install-world installcheck-world:
 	@if [ ! -f GNUmakefile ] ; then \
 	   echo "You need to run the 'configure' program first. See the file"; \
 	   echo "'INSTALL' for installation instructions." ; \
diff --git a/doc/src/sgml/contrib.sgml b/doc/src/sgml/contrib.sgml
index 2895e6c170..3ed2023b1b 100644
--- a/doc/src/sgml/contrib.sgml
+++ b/doc/src/sgml/contrib.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/contrib.sgml,v 1.15 2009/11/18 21:57:56 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/contrib.sgml,v 1.16 2010/01/28 23:59:52 adunstan Exp $ -->
 
 <appendix id="contrib">
  <title>Additional Supplied Modules</title>
@@ -16,7 +16,9 @@
 
  <para>
   When building from the source distribution, these modules are not built
-  automatically.  You can build and install all of them by running:
+  automatically, unless you build the "world" target 
+  (see <xref linkend="build">).
+  You can build and install all of them by running:
 <screen>
 <userinput>gmake</userinput>
 <userinput>gmake install</userinput>
diff --git a/doc/src/sgml/installation.sgml b/doc/src/sgml/installation.sgml
index 23d120b8a3..003d172b01 100644
--- a/doc/src/sgml/installation.sgml
+++ b/doc/src/sgml/installation.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.339 2010/01/22 22:50:03 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.340 2010/01/28 23:59:52 adunstan Exp $ -->
 
 <chapter id="installation">
  <title><![%standalone-include[<productname>PostgreSQL</>]]>
@@ -1526,7 +1526,7 @@ su - postgres
     </para>
    </step>
 
-  <step>
+  <step id="build">
    <title>Build</title>
 
    <para>
@@ -1539,6 +1539,18 @@ su - postgres
     hardware. The last line displayed should be:
 <screen>
 All of PostgreSQL is successfully made. Ready to install.
+</screen>
+   </para>
+
+  <para>
+   If you want to build everything that can be built, including the HTML
+   documentation and the Additional Modules, type instead:
+<screen>
+<userinput>gmake world</userinput>
+</screen>
+   The last line displayed should be:
+<screen>
+PostgreSQL, contrib and HTML documentation successfully made. Ready to install.
 </screen>
    </para>
   </step>
@@ -1594,6 +1606,13 @@ All of PostgreSQL is successfully made. Ready to install.
     be granted.
    </para>
 
+   <para>
+    If you built the world above, type instead:
+<screen>
+<userinput>gmake install-world</userinput>
+</screen>
+   </para>
+
    <para>
     You can use <literal>gmake install-strip</literal> instead of
     <literal>gmake install</literal> to strip the executable files and