Index: /trunk/doc/manual/en_US/user_Glossary.xml
===================================================================
--- /trunk/doc/manual/en_US/user_Glossary.xml	(revision 62237)
+++ /trunk/doc/manual/en_US/user_Glossary.xml	(revision 62238)
@@ -117,14 +117,4 @@
         machine when networking is configured to NAT; see <xref
         linkend="networkingdetails" />.</para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry>
-      <glossterm>DKMS</glossterm>
-
-      <glossdef>
-        <para>Dynamic Kernel Module Support. A framework that simplifies
-        installing and updating external kernel modules on Linux machines; see
-        <xref linkend="externalkernelmodules" />.</para>
       </glossdef>
     </glossentry>
Index: /trunk/doc/manual/en_US/user_GuestAdditions.xml
===================================================================
--- /trunk/doc/manual/en_US/user_GuestAdditions.xml	(revision 62237)
+++ /trunk/doc/manual/en_US/user_GuestAdditions.xml	(revision 62238)
@@ -595,16 +595,7 @@
             on a Linux host system, as described there.</para>
 
-            <para>Again, as with Linux hosts, we recommend using DKMS if it is
-            available for the guest system. If it is not installed, use this
-            command for Ubuntu/Debian systems:
-            <screen>sudo apt-get install dkms</screen>
-            or for Fedora systems: <screen>yum install dkms</screen></para>
-
-            <para>Be sure to install DKMS <emphasis>before</emphasis>
-            installing the Linux Guest Additions. If DKMS is not available
-            or not installed, the guest kernel modules will need to be
-            recreated manually whenever the guest kernel is updated using
-            the command <screen>rcvboxadd setup</screen> as root.
-            </para>
+            <para>If you suspect that something has gone wrong, check that your
+            guest is set up correctly and try executing the command
+            <screen>rcvboxadd setup</screen> as root.</para>
           </listitem>
 
@@ -625,224 +616,4 @@
           </listitem>
         </orderedlist>
-
-        <para>For your convenience, we provide the following step-by-step
-        instructions for freshly installed copies of recent versions of the most
-        popular Linux distributions. After these preparational steps, you can
-        execute the VirtualBox Guest Additions installer as described
-        above.</para>
-
-        <sect4>
-          <title>Ubuntu</title>
-
-          <para><orderedlist>
-              <listitem>
-                <para>In order to fully update your guest system, open a
-                terminal and run <screen>apt-get update</screen> as root
-                followed by <screen>apt-get upgrade</screen></para>
-              </listitem>
-
-              <listitem>
-                <para>Install DKMS using <screen>apt-get install dkms</screen></para>
-              </listitem>
-
-              <listitem>
-                <para>Reboot your guest system in order to activate the
-                updates and then proceed as described above.</para>
-              </listitem>
-            </orderedlist></para>
-        </sect4>
-
-        <sect4>
-          <title>Fedora</title>
-
-          <para><orderedlist>
-              <listitem>
-                <para>In order to fully update your guest system, open a
-                terminal and run <screen>yum update</screen> as root.</para>
-              </listitem>
-
-              <listitem>
-                <para>Install DKMS and the GNU C compiler using <screen>yum install dkms</screen>
-                followed by <screen>yum install gcc</screen></para>
-              </listitem>
-
-              <listitem>
-                <para>Reboot your guest system in order to activate the
-                updates and then proceed as described above.</para>
-              </listitem>
-            </orderedlist></para>
-        </sect4>
-
-        <sect4>
-          <title>openSUSE</title>
-
-          <para><orderedlist>
-              <listitem>
-                <para>In order to fully update your guest system, open a
-                terminal and run <screen>zypper update</screen> as root.</para>
-              </listitem>
-
-              <listitem>
-                <para>Install the make tool and the GNU C compiler using
-                <screen>zypper install make gcc</screen></para>
-              </listitem>
-
-              <listitem>
-                <para>Reboot your guest system in order to activate the
-                updates.</para>
-              </listitem>
-
-              <listitem>
-                <para>Find out which kernel you are running using <screen>uname -a</screen>
-                An example would be
-                <computeroutput>2.6.31.12-0.2-default</computeroutput> which
-                refers to the "default" kernel. Then install the correct
-                kernel development package. In the above example this would be
-                <screen>zypper install kernel-default-devel</screen></para>
-              </listitem>
-
-              <listitem>
-                <para>Make sure that your running kernel
-                (<computeroutput>uname -a</computeroutput>) and the kernel
-                packages you have installed (<computeroutput>rpm -qa
-                kernel\*</computeroutput>) have the exact same version number.
-                Proceed with the installation as described above.</para>
-              </listitem>
-            </orderedlist></para>
-        </sect4>
-
-        <sect4>
-          <title>SuSE Linux Enterprise Desktop (SLED)</title>
-
-          <para><orderedlist>
-              <listitem>
-                <para>In order to fully update your guest system, open a
-                terminal and run <screen>zypper update</screen> as root.</para>
-              </listitem>
-
-              <listitem>
-                <para>Install the GNU C compiler using <screen>zypper install gcc</screen></para>
-              </listitem>
-
-              <listitem>
-                <para>Reboot your guest system in order to activate the
-                updates.</para>
-              </listitem>
-
-              <listitem>
-                <para>Find out which kernel you are running using <screen>uname -a</screen>
-                An example would be
-                <computeroutput>2.6.27.19-5.1-default</computeroutput> which
-                refers to the "default" kernel. Then install the correct
-                kernel development package. In the above example this would be
-                <screen>zypper install kernel-syms kernel-source</screen></para>
-              </listitem>
-
-              <listitem>
-                <para>Make sure that your running kernel
-                (<computeroutput>uname -a</computeroutput>) and the kernel
-                packages you have installed (<computeroutput>rpm -qa
-                kernel\*</computeroutput>) have the exact same version number.
-                Proceed with the installation as described above.</para>
-              </listitem>
-            </orderedlist></para>
-        </sect4>
-
-        <sect4>
-          <title>Mandrake</title>
-
-          <para><orderedlist>
-              <listitem>
-                <para>Mandrake ships with the VirtualBox Guest Additions which
-                will be replaced if you follow these steps.</para>
-              </listitem>
-
-              <listitem>
-                <para>In order to fully update your guest system, open a
-                terminal and run <screen>urpmi --auto-update</screen>
-                as root.</para>
-              </listitem>
-
-              <listitem>
-                <para>Reboot your system in order to activate the
-                updates.</para>
-              </listitem>
-
-              <listitem>
-                <para>Install DKMS using <screen>urpmi dkms</screen> and make
-                sure to choose the correct kernel-devel package when asked by
-                the installer (use <computeroutput>uname -a</computeroutput>
-                to compare).</para>
-              </listitem>
-            </orderedlist></para>
-        </sect4>
-
-        <sect4>
-          <title>Oracle Linux, Red Hat Enterprise Linux and CentOS</title>
-
-          <para><orderedlist>
-              <listitem>
-                <para>For versions prior to 6, add <computeroutput>divider=10</computeroutput>
-                to the kernel boot options in
-                <computeroutput>/etc/grub.conf</computeroutput> to reduce the
-                idle CPU load.</para>
-              </listitem>
-
-              <listitem>
-                <para>In order to fully update your guest system, open a
-                terminal and run <screen>yum update</screen> as root.</para>
-              </listitem>
-
-              <listitem>
-                <para>Install the GNU C compiler and the kernel development
-                packages using <screen>yum install gcc</screen> followed by
-                <screen>yum install kernel-devel</screen> For Oracle UEK
-                kernels, use <screen>yum install kernel-uek-devel</screen>
-                to install the UEK kernel headers.</para>
-              </listitem>
-
-              <listitem>
-                <para>Reboot your guest system in order to activate the
-                updates and then proceed as described above.</para>
-              </listitem>
-
-              <listitem>
-                <para>In case Oracle Linux does not find the
-                required packages, you either have to install them from a
-                different source (e.g. DVD) or use Oracle's public Yum server
-                located at <ulink
-                url="http://public-yum.oracle.com/">http://public-yum.oracle.com</ulink>.</para>
-              </listitem>
-            </orderedlist></para>
-        </sect4>
-
-        <sect4>
-          <title>Debian</title>
-
-          <para><orderedlist>
-              <listitem>
-                <para>In order to fully update your guest system, open a
-                terminal and run <screen>apt-get update</screen> as root
-                followed by <screen>apt-get upgrade</screen></para>
-              </listitem>
-
-              <listitem>
-                <para>Install the make tool and the GNU C compiler using
-                <screen>apt-get install make gcc</screen></para>
-              </listitem>
-
-              <listitem>
-                <para>Reboot your guest system in order to activate the
-                updates.</para>
-              </listitem>
-
-              <listitem>
-                <para>Determine the exact version of your kernel using
-                <computeroutput>uname -a</computeroutput> and install the
-                correct version of the linux-headers package, e.g. using
-                <screen>apt-get install linux-headers-2.6.26-2-686</screen></para>
-              </listitem>
-            </orderedlist></para>
-        </sect4>
       </sect3>
 
Index: /trunk/doc/manual/en_US/user_Installation.xml
===================================================================
--- /trunk/doc/manual/en_US/user_Installation.xml	(revision 62237)
+++ /trunk/doc/manual/en_US/user_Installation.xml	(revision 62238)
@@ -366,100 +366,61 @@
       more advanced networking features of VirtualBox.</para>
 
-      <para>The VirtualBox kernel module is automatically installed on your
-      system when you install VirtualBox. To maintain it with future kernel
-      updates, for those Linux distributions which provide it -- most current
-      ones -- we recommend installing Dynamic Kernel Module Support
-      (DKMS)<footnote>
-          <para>See <ulink
-          url="http://en.wikipedia.org/wiki/Dynamic_Kernel_Module_Support">http://en.wikipedia.org/wiki/Dynamic_Kernel_Module_Support</ulink>
-          for an introduction.</para>
-        </footnote>. This framework helps with building and upgrading kernel
-      modules.</para>
-
-      <para>If DKMS is not already installed, execute one of the following:
+      <para>The modules will be built automatically during installation or
+      after kernel updates if your Linux system is prepared for building
+      external kernel modules.</para>
+
+      <para>Most Linux distributions can be set up simply by installing
+      the right packages - normally, these will be the GNU compiler
+      (GCC), GNU Make (make) and packages containing header files for
+      your kernel - and making sure that all system updates are
+      installed and that the system is running the most up-to-date
+      kernel included in the distribution. <emphasis>The version numbers
+      of the header file packages must be the same as that of the kernel
+      you are using.</emphasis></para>
+
       <itemizedlist>
-          <listitem>
-            <para>On an Ubuntu system:</para>
-
-            <screen>sudo apt-get install dkms</screen>
-          </listitem>
-
-          <listitem>
-            <para>On a Fedora system:<screen>yum install dkms</screen></para>
-          </listitem>
-
-          <listitem>
-            <para>On a Mandriva or Mageia system:<screen>urpmi dkms</screen></para>
-          </listitem>
-        </itemizedlist></para>
-
-      <para>If DKMS is available and installed, the VirtualBox kernel module
-      should always work automatically, and it will be automatically rebuilt
-      if your host kernel is updated.</para>
-
-      <para>Otherwise, there are only two situations in which you will need to
-      worry about the kernel module:<orderedlist>
-          <listitem>
-            <para>The original installation fails. This probably means that
-            your Linux system is not prepared for building external kernel
-            modules.</para>
-
-            <para>Most Linux distributions can be set up simply by installing
-            the right packages - normally, these will be the GNU compiler
-            (GCC), GNU Make (make) and packages containing header files for
-            your kernel - and making sure that all system updates are
-            installed and that the system is running the most up-to-date
-            kernel included in the distribution. <emphasis>The version numbers
-            of the header file packages must be the same as that of the kernel
-            you are using.</emphasis></para>
-
-            <itemizedlist>
-              <listitem>
-                <para>With Debian and Ubuntu releases, you must install the
-                right version of the
-                <computeroutput>linux-headers</computeroutput> and if it
-                exists the <computeroutput>linux-kbuild</computeroutput>
-                package. Current Ubuntu releases should have the right
-                packages installed by default.</para>
-              </listitem>
-
-              <listitem>
-                <para>In even older Debian and Ubuntu releases, you must
-                install the right version of the
-                <computeroutput>kernel-headers</computeroutput>
-                package.</para>
-              </listitem>
-
-              <listitem>
-                <para>On Fedora and Redhat systems, the package is
-                <computeroutput>kernel-devel</computeroutput>.</para>
-              </listitem>
-
-              <listitem>
-                <para>On SUSE and openSUSE Linux, you must install the right
-                versions of the <computeroutput>kernel-source</computeroutput>
-                and <computeroutput>kernel-syms</computeroutput>
-                packages.</para>
-              </listitem>
-
-              <listitem>
-                <para>If you have built your own kernel, you will need to make
-                sure that you also installed all the required header and other
-                files for building external modules to the right locations.
-                The details of how to do this will depend on how you built
-                your kernel, and if you are unsure you should consult the
-                documentation which you followed to do so.</para>
-              </listitem>
-            </itemizedlist>
-          </listitem>
-
-          <listitem>
-            <para>The kernel of your Linux host was updated and DKMS is not
-            installed. In that case, the kernel module will need to be
-            reinstalled by executing (as root):</para>
-
-            <screen>rcvboxdrv setup</screen>
-          </listitem>
-        </orderedlist></para>
+        <listitem>
+          <para>With Debian and Ubuntu releases, you must install the
+          right version of the
+          <computeroutput>linux-headers</computeroutput> and if it
+          exists the <computeroutput>linux-kbuild</computeroutput>
+          package. Current Ubuntu releases should have the right
+          packages installed by default.</para>
+        </listitem>
+
+        <listitem>
+          <para>In even older Debian and Ubuntu releases, you must
+          install the right version of the
+          <computeroutput>kernel-headers</computeroutput>
+          package.</para>
+        </listitem>
+
+        <listitem>
+          <para>On Fedora and Redhat systems, the package is
+          <computeroutput>kernel-devel</computeroutput>.</para>
+        </listitem>
+
+        <listitem>
+          <para>On SUSE and openSUSE Linux, you must install the right
+          versions of the <computeroutput>kernel-source</computeroutput>
+          and <computeroutput>kernel-syms</computeroutput>
+          packages.</para>
+        </listitem>
+
+        <listitem>
+          <para>If you have built your own kernel, you will need to make
+          sure that you also installed all the required header and other
+          files for building external modules to the right locations.
+          The details of how to do this will depend on how you built
+          your kernel, and if you are unsure you should consult the
+          documentation which you followed to do so.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>If you suspect that something has gone wrong with module installation,
+      check that your system is set up as described above and try running (as root)
+      the following command:</para>
+
+      <screen>rcvboxdrv setup</screen>
     </sect2>
 
