diff --git a/gnome/gnome.ent b/gnome/gnome.ent
index f1ef4a3c08..d1469fb4f4 100644
--- a/gnome/gnome.ent
+++ b/gnome/gnome.ent
@@ -14,6 +14,7 @@
 <!ENTITY % libIDL SYSTEM "lib/libidl/libidl.ent">
 <!ENTITY % orbit2 SYSTEM "lib/orbit/orbit2.ent">
 <!ENTITY % bonobo-activation SYSTEM "lib/bonobo/bonobo-activation.ent">
+<!ENTITY % gconf SYSTEM "lib/gconf/gconf.ent">
 %libglade;
 %intltool;
 %scrollkeeper;
@@ -26,6 +27,7 @@
 %libIDL;
 %orbit2;
 %bonobo-activation;
+%gconf;
 
 <!-- Gnome Core -->
 <!ENTITY gnome-core SYSTEM "core/core.xml">
diff --git a/gnome/lib/gconf.xml b/gnome/lib/gconf.xml
new file mode 100644
index 0000000000..a39aa51589
--- /dev/null
+++ b/gnome/lib/gconf.xml
@@ -0,0 +1,11 @@
+<sect1 id="GConf" xreflabel="GConf-&GConf-version;">
+<?dbhtml filename="GConf.html" dir="gnome"?>
+<title>GConf-&GConf-version;</title>
+
+&GConf-intro;
+&GConf-inst;
+&GConf-config;
+&GConf-desc;
+
+</sect1>
+
diff --git a/gnome/lib/gconf/gconf-config.xml b/gnome/lib/gconf/gconf-config.xml
new file mode 100644
index 0000000000..e7a6beb0f5
--- /dev/null
+++ b/gnome/lib/gconf/gconf-config.xml
@@ -0,0 +1,12 @@
+<sect2>
+<title>Configuring GConf</title>
+
+
+<sect3><title>Configuration Information</title>
+
+&library-config;
+
+</sect3>
+
+</sect2>
+
diff --git a/gnome/lib/gconf/gconf-desc.xml b/gnome/lib/gconf/gconf-desc.xml
new file mode 100644
index 0000000000..48f8114df6
--- /dev/null
+++ b/gnome/lib/gconf/gconf-desc.xml
@@ -0,0 +1,16 @@
+<sect2>
+<title>Contents</title>
+
+<para>The GConf package contains <userinput>libgconf libraries</userinput>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>libgconf libraries</title>
+<para>libgconf libraries provides the functions necessary to maintain
+the configuration database.</para></sect3>
+
+
+</sect2>
+
diff --git a/gnome/lib/gconf/gconf-inst.xml b/gnome/lib/gconf/gconf-inst.xml
new file mode 100644
index 0000000000..cf03678f75
--- /dev/null
+++ b/gnome/lib/gconf/gconf-inst.xml
@@ -0,0 +1,11 @@
+<sect2>
+<title>Installation of GConf</title>
+
+<para>Install GConf by running the following commands:</para>
+
+<para><screen><userinput>./configure --prefix=/opt/gnome2 --libexecdir=/opt/gnome2/sbin --sysconfdir=/etc/gnome &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
+
+</sect2>
+
diff --git a/gnome/lib/gconf/gconf-intro.xml b/gnome/lib/gconf/gconf-intro.xml
new file mode 100644
index 0000000000..89541a32aa
--- /dev/null
+++ b/gnome/lib/gconf/gconf-intro.xml
@@ -0,0 +1,17 @@
+<sect2>
+<title>Introduction to GConf</title>
+
+<screen>Download location (HTTP):       <ulink url="&GConf-download-http;"/>
+Download location (FTP):        <ulink url="&GConf-download-ftp;"/>
+Version used:                   &GConf-version;
+Package size:                   &GConf-size;
+Estimated Disk space required:  &GConf-buildsize;</screen>
+
+<para>The GConf package contains a configuration database system.</para>
+
+<screen>GConf depends on:
+<xref linkend="ORBit2"/>
+GConf will utilize:
+<xref linkend="gtk-doc"/></screen>
+
+</sect2>
diff --git a/gnome/lib/gconf/gconf.ent b/gnome/lib/gconf/gconf.ent
new file mode 100644
index 0000000000..5151604d71
--- /dev/null
+++ b/gnome/lib/gconf/gconf.ent
@@ -0,0 +1,11 @@
+<!ENTITY GConf SYSTEM "../gconf.xml">
+<!ENTITY GConf-intro SYSTEM "gconf-intro.xml">
+<!ENTITY GConf-inst SYSTEM "gconf-inst.xml">
+<!ENTITY GConf-exp SYSTEM "gconf-exp.xml">
+<!ENTITY GConf-desc SYSTEM "gconf-desc.xml">
+<!ENTITY GConf-config SYSTEM "gconf-config.xml">
+<!ENTITY GConf-buildsize "10 MB">
+<!ENTITY GConf-version "1.2.1">
+<!ENTITY GConf-download-http "http://ftp.gnome.org/pub/GNOME/2.0.1/sources/GConf/GConf-1.2.1.tar.gz">
+<!ENTITY GConf-download-ftp "ftp://ftp.gnome.org/pub/GNOME/2.0.1/sources/GConf/GConf-1.2.1.tar.gz">
+<!ENTITY GConf-size "1.5 MB">
diff --git a/gnome/lib/lib.xml b/gnome/lib/lib.xml
index 8314dea6e3..bd1b53b954 100644
--- a/gnome/lib/lib.xml
+++ b/gnome/lib/lib.xml
@@ -53,6 +53,7 @@ libghttp
 &libIDL;
 &ORBit2;
 &bonobo-activation;
+&GConf;
 &gdk;
 
 </chapter>
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index bf864d68a5..5d4d93a67f 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -10,8 +10,7 @@ page in Chapter 1 for details on who wrote what.</para>
 
 <itemizedlist>
 
-<listitem><para>August 31st, 2002 [larry]: Gnome: Added
-libIDL-0.8.0, ORBit2-2.4.1 and bonobo-activation-1.0.3.</para></listitem>
+<listitem><para>August 31st, 2002 [larry]: Gnome: Added libIDL-0.8.0, ORBit2-2.4.1, bonobo-activation-1.0.3 and GConf-1.2.1.</para></listitem>
 
 <listitem><para>August 31st, 2002 [larry]: Multimedia: Updated to
 esound-0.2.29.</para></listitem>
diff --git a/introduction/welcome/credits.xml b/introduction/welcome/credits.xml
index e015710045..7eedc4f7e8 100644
--- a/introduction/welcome/credits.xml
+++ b/introduction/welcome/credits.xml
@@ -73,7 +73,10 @@ objprelink and KDE: <emphasis>Bruce Dubbs</emphasis>.</para>
 
 <listitem><para>Alsa: <emphasis>Alex Kloss</emphasis></para></listitem>
 
-<listitem><para>ATK, audiofile, bc, bonobo-activation, cdrdao, cdrtools, cpio, curl, dhcp, DocBook, enlightenment, esound, fcron, fluxbox, FNLIB, gcc, gdbm, gmp, gnat, imlib, GLib2, gnome-common, gnome-libs, GTK+2, gtk-doc, intltool, j2sdk, libao, libglade, libIDL, libogg, librep, lame, libvorbis, libxml2, libxslt, linc, mutt, OpenSSH, ORBit, ORBit2, Pango, pccts, pcre, pkgconfig, postfix, procmail, Python, QT, rep-gtk, ruby, sawfish, scrollkeeper, unzip, vorbis-tools, wget, XFce and zip: <emphasis>Larry Lawrence</emphasis></para></listitem>
+<listitem><para>ATK, audiofile, bc, bonobo-activation, cdrdao, cdrtools,
+cpio, curl, dhcp, DocBook, enlightenment, esound, fcron, fluxbox, FNLIB,
+gcc, gdbm, GLib2, gmp, gnat, gnome-common, gnome-libs, GTK+2,
+gtk-doc, imlib, intltool, j2sdk, libao, libglade, libIDL, libogg, librep, lame, libvorbis, libxml2, libxslt, linc, mutt, OpenSSH, ORBit, ORBit2, Pango, pccts, pcre, pkgconfig, postfix, procmail, Python, QT, rep-gtk, ruby, sawfish, scrollkeeper, unzip, vorbis-tools, wget, XFce and zip: <emphasis>Larry Lawrence</emphasis></para></listitem>
 
 <listitem><para>CDParanoia, mpg123, SDL and XMMS: <emphasis>Jeroen
 Coumans</emphasis></para></listitem>