diff --git a/ChangeLog b/ChangeLog
index 0b21835..2763bc8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-08-18  Owen Taylor  <otaylor@redhat.com>
+
+	* foundation.gnome.org/licensing/index.wml: Add intro text.
+
+	* foundation.gnome.org/licensing/guidelines/index.wml
+	* foundation.gnome.org/licensing/Makefile.am (SUBDIRS)
+	* configure.in: Add third-paty usage guidelines.
+
 2005-08-02  Owen Taylor  <otaylor@redhat.com>
 
 	* foundation.gnome.org/licensing/usergroup/index.wml: Replace UTF-8
diff --git a/configure.in b/configure.in
index 2cb11d2..a81d6fd 100644
--- a/configure.in
+++ b/configure.in
@@ -28,6 +28,7 @@ foundation.gnome.org/img/Makefile
 foundation.gnome.org/img/logos/Makefile
 foundation.gnome.org/legal/Makefile
 foundation.gnome.org/licensing/Makefile
+foundation.gnome.org/licensing/guidelines/Makefile
 foundation.gnome.org/licensing/usergroup/Makefile
 foundation.gnome.org/finance/Makefile
 foundation.gnome.org/membership/Makefile
diff --git a/foundation.gnome.org/licensing/Makefile.am b/foundation.gnome.org/licensing/Makefile.am
index dce5806..0fbae0c 100644
--- a/foundation.gnome.org/licensing/Makefile.am
+++ b/foundation.gnome.org/licensing/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = usergroup
+SUBDIRS = guidelines usergroup 
 
 urlpath = /licensing
  
diff --git a/foundation.gnome.org/licensing/index.wml b/foundation.gnome.org/licensing/index.wml
index a0f9c7d..1c4c434 100644
--- a/foundation.gnome.org/licensing/index.wml
+++ b/foundation.gnome.org/licensing/index.wml
@@ -3,15 +3,53 @@
 <html>
 
   <head>
-    <title>Trademark and Copyright licensing</title>
+    <title>Trademark licensing</title>
     <meta name="cvsdate" content="$Date$" />
   </head>
  
   <body>
-    <h1>Trademark and Copyright licensing</h1>
-
+    <h1>Trademark licensing</h1>
     <p>
+      One of the functions that the GNOME Foundation provides is to
+      act as the legal owner for such GNOME project assets as the
+      GNOME name and the GNOME foot. These trademarks are some of
+      GNOME's most important assets. We must protect the trademarks in
+      order to keep them. Therefore, we have some guidelines for their
+      use and a standard agreement for user groups. These cover many
+      common situations; if you need permission to use the GNOME
+      trademarks in other ways or have other questions, please
+      contact <a href="mailto:licensing@gnome.org">licensing@gnome.org</a>.
+    </p>
+    <p>
+      The GNOME trademarks are:
+    </p>
+    <ul>
+      <li>The word GNOME&#x2122;</li>
+      <li>The GNOME foot logo: <link rel="icon" type="image/png" href="http://www.gnome.org/img/logo/text-64.png"/></li>
+    <ul>
+    <h2>Third-party usage guidelines</h2>
+    <p>
+      Under the law, “fair use” of trademarks is allowed (for example,
+      trademarks typically may be used without permission in magazine
+      and book reviews). The <a href="/licensing/guidelines/">GNOME
+      Foundation trademark usage guidelines for third parties</a>
+      describe what is appropriate fair use of the GNOME trademarks.
+    </p>
+    <h2>User group license agreement</h2>
+    <p>
+      User groups are a very important part of the GNOME
+      community. User groups have a need to make use of the GNOME
+      trademarks in such ways as creating and distributing marketing
+      materials or creating web sites. (The usage of the term user
+      group here is broad: the canonical example would be a group of
+      people using and promoting GNOME in a specific locality, but it
+      could also be a group of developers working on an open source
+      GNOME application or many similar non-commerical uses.)
+    </p>
+    <p>
+      By agreeing to the <a href="/licensing/usergroup/">GNOME user
+	group license agreement</a> a user group obtains permission to
+      use the GNOME trademarks under certain conditions.
     </p>
-
   </body>
 </html>
