Index: /trunk/doc/manual/en_US/user_VBoxManage.xml
===================================================================
--- /trunk/doc/manual/en_US/user_VBoxManage.xml	(revision 38098)
+++ /trunk/doc/manual/en_US/user_VBoxManage.xml	(revision 38099)
@@ -1107,10 +1107,12 @@
        </listitem>
        <listitem>
-           <para><computeroutput>--mode machine|all</computeroutput>: 
+           <para><computeroutput>--mode machine|machineandchildren|all</computeroutput>: 
            Selects the cloning mode of the operation. If
            <computeroutput>machine</computeroutput> is selected (the default),
-           the current state of the VM without any snapshots is cloned. If
-           <computeroutput>all</computeroutput> is the selected mode all
-           snapshots and the current state are cloned.
+           the current state of the VM without any snapshots is cloned. In the
+           <computeroutput>machineandchildren</computeroutput> mode the snapshot
+           provided by <computeroutput>--snapshot</computeroutput> and all
+           child snapshots are cloned. If <computeroutput>all</computeroutput>
+           is the selected mode all snapshots and the current state are cloned.
            </para>
        </listitem>
Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp	(revision 38098)
+++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp	(revision 38099)
@@ -335,5 +335,5 @@
                      "VBoxManage clonevm          <uuid>|<name>\n"
                      "                            [--snapshot <uuid>|<name>]\n"
-                     "                            [--mode machine|all]\n"
+                     "                            [--mode machine|machineandchildren|all]\n"
                      "                            [--options link|keepallmacs|keepnatmacs|\n"
                      "                                       keepdisknames]\n"
Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp	(revision 38098)
+++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp	(revision 38099)
@@ -282,6 +282,6 @@
     if (!RTStrICmp(psz, "machine"))
         *pMode = CloneMode_MachineState;
-//    else if (!RTStrICmp(psz, "machineandchildren"))
-//        *pMode = CloneMode_MachineAndChildStates;
+    else if (!RTStrICmp(psz, "machineandchildren"))
+        *pMode = CloneMode_MachineAndChildStates;
     else if (!RTStrICmp(psz, "all"))
         *pMode = CloneMode_AllStates;
Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UICloneVMWizard.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UICloneVMWizard.cpp	(revision 38098)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UICloneVMWizard.cpp	(revision 38099)
@@ -40,6 +40,5 @@
      * for it. */
     if (machine.GetSnapshotCount() > 0)
-//        addPage(new UICloneVMWizardPage2(fShowChildsOption));
-        addPage(new UICloneVMWizardPage2(false));
+        addPage(new UICloneVMWizardPage2(fShowChildsOption));
 
     /* Translate wizard: */
Index: /trunk/src/VBox/Main/src-server/MachineImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/MachineImpl.cpp	(revision 38098)
+++ /trunk/src/VBox/Main/src-server/MachineImpl.cpp	(revision 38099)
@@ -6254,10 +6254,4 @@
     CheckComArgNotNull(pTarget);
     CheckComArgOutPointerValid(pProgress);
-
-    /** @todo r=klaus disabled as there are apparently still cases which are
-     * not handled correctly */
-    if (mode == CloneMode_MachineAndChildStates)
-        return setError(VBOX_E_NOT_SUPPORTED,
-                        tr("The clone mode \"Machine and child states\" is not yet supported. Please try again in the next VirtualBox maintenance update"));
 
     /* Convert the options. */