Index: /trunk/doc/manual/en_US/user_GuestAdditions.xml
===================================================================
--- /trunk/doc/manual/en_US/user_GuestAdditions.xml	(revision 35140)
+++ /trunk/doc/manual/en_US/user_GuestAdditions.xml	(revision 35141)
@@ -223,13 +223,9 @@
 
         <para>In the "Devices" menu in the virtual machine's menu bar,
-        VirtualBox has a handy menu item named "Install Guest Additions",
-        which either allows to upgrade already installed Guest Additions (only
-        Windows Guest Additions 4.0 and later) automatically or mounts the
-        Guest Additions ISO file inside your virtual machine to perform a
-        manual update.</para>
-
-        <para>In case of a manual update, a Windows guest should then
-        automatically start the Guest Additions installer, which allows to
-        install the Guest Additions into your Windows guest.</para>
+        VirtualBox has a handy menu item named "Install guest additions",
+        which mounts the Guest Additions ISO file inside your virtual machine.
+        A Windows guest should then automatically start the Guest Additions
+        installer, which installs the Guest Additions into your Windows
+        guest.</para>
 
         <note>
@@ -1507,9 +1503,6 @@
     guest directories is available.</para>
 
-    <para>To use these feature, use the VirtualBox command line or the GUI.
-    See <xref linkend="mountingadditionsiso" /> for automatically updating the
-    Guest Additions or <xref linkend="vboxmanage-guestcontrol" /> for
-    executing guest programs, copying files from the host or creating guest
-    directories.</para>
+    <para>To use these features, use the VirtualBox command line, see
+    <xref linkend="vboxmanage-guestcontrol" />.</para>
   </sect1>
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp	(revision 35140)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp	(revision 35141)
@@ -361,4 +361,8 @@
      */
     bool fDoMount = false;
+    /* Auto-update in GUI currently is disabled. */
+#ifndef VBOX_WITH_ADDITIONS_AUTOUPDATE_UI
+    fDoMount = true;
+#else
     CGuest guest = session().GetConsole().GetGuest();
     /* Since we are going to show a modal progress dialog we don't want to wait for the whole
@@ -394,4 +398,5 @@
         }
     }
+#endif /* VBOX_WITH_ADDITIONS_AUTOUPDATE_UI */
 
     if (fDoMount) /* Fallback to only mounting the .ISO file. */