diff --git a/documentation/configuring.sgml b/documentation/configuring.sgml
index 21950a7fd97..d933d075aac 100644
--- a/documentation/configuring.sgml
+++ b/documentation/configuring.sgml
@@ -93,6 +93,11 @@
                 <entry>recmd</entry>
                 <entry>Overides defaults for DLL loading</entry>
               </row>
+              <row>
+                <entry>[x11drv]</entry>
+                <entry>recmd</entry>
+                <entry>Graphic driver settings</entry>
+              </row>
               <row>
                 <entry>[fonts]</entry>
                 <entry>yes</entry>
@@ -108,6 +113,11 @@
                 <entry>no</entry>
                 <entry>LPT ports seen by wine</entry>
               </row>
+              <row>
+                <entry>[ppdev]</entry>
+                <entry>no</entry>
+                <entry>Parallelport emulation</entry>
+              </row>
               <row>
                 <entry>[spooler]</entry>
                 <entry>no</entry>
@@ -143,11 +153,26 @@
                 <entry>no</entry>
                 <entry>Console settings</entry>
               </row>
+              <row>
+                <entry>[Clipboard]</entry>
+                <entry>no</entry>
+                <entry>Interaction for wine and X11 clipboard</entry>
+              </row>
+              <row>
+                <entry>[afmdirs]</entry>
+                <entry>no</entry>
+                <entry>Postscript driver settings</entry>
+              </row>
               <row>
                 <entry>[WinMM]</entry>
                 <entry>yes</entry>
                 <entry>Multimedia settings</entry>
               </row>
+              <row>
+                <entry>[AppDefaults]</entry>
+                <entry>no</entry>
+                <entry>Overwrite the settings of previous sections for special programs</entry>
+              </row>
             </tbody>
           </tgroup>
         </informaltable>
@@ -835,6 +860,39 @@ OPTIONAL:
 	    </itemizedlist>
           </para>
 	</sect3>
+
+        <sect3>
+          <title>The [AppDefaults] Section</title>
+          <para>
+            The section is used to overwrite the setting of this file for a
+            special program with different settings.
+            [AppDefaults] is not the real name of the section. The real name
+            consists of the leading word AppDefaults followed by the name 
+            of the executable the section is valid for. The end of the section
+            name is the name of the section of the configuration file its 
+            values should be overwritten with different settings. The three 
+            parts of the section name are separated by two backslashes.
+          </para>
+          <para>
+            Currently wine supports only overwriting the sections 
+            [DllOverrides] and [x11drv].
+          </para>
+          <para>
+            Here is an example that overwrites the normal settings for a
+            program:
+	    <programlisting> 
+;; default settings
+[x11drv]
+"Managed" = "Y"
+"Desktop" = "N"
+
+;; run install in desktop mode
+[AppDefaults\\install.exe\\x11drv]
+"Managed" = "N"
+"Desktop" = "800x600"
+	    </programlisting> 
+          </para>
+        </sect3>
       </sect2>
 
       <sect2>
@@ -946,7 +1004,7 @@ OPTIONAL:
         Written by &name-ove-kaaven; <email>&email-ove-kaaven;</email>
       </para>
       <para>
-        (Extracted from <filename>wine/documentation/cdrom-labels</filename>)
+        (Extracted from <filename>wine/documentation/x11drv</filename>)
       </para>
 
       <para>
diff --git a/documentation/wine.conf.man.in b/documentation/wine.conf.man.in
index a890450f7a6..ef335c1d521 100644
--- a/documentation/wine.conf.man.in
+++ b/documentation/wine.conf.man.in
@@ -258,9 +258,11 @@ the general
 .I DllOverrides
 section.
 .br
-The only section that supports application-specific information at the
-moment is
-.I DllOverrides.
+The only sections that support application-specific information at the
+moment are
+.I DllOverrides 
+and 
+.I x11drv.
 .br
 Make sure to use double backslashes in the section name.
 .PP