Index: /trunk/src/VBox/Frontends/VBoxManage/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Frontends/VBoxManage/Makefile.kmk	(revision 81286)
+++ /trunk/src/VBox/Frontends/VBoxManage/Makefile.kmk	(revision 81287)
@@ -44,4 +44,6 @@
 	$(if $(VBOX_WITH_AUDIO_RECORDING),VBOX_WITH_AUDIO_RECORDING) \
  	$(if $(VBOX_WITH_NAT_SERVICE),VBOX_WITH_NAT_SERVICE) \
+ 	$(if $(VBOX_WITH_SHARED_CLIPBOARD),VBOX_WITH_SHARED_CLIPBOARD) \
+ 	$(if $(VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS),VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS) \
  	$(if $(VBOX_WITH_VMSVGA),VBOX_WITH_VMSVGA)
 
Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageControlVM.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageControlVM.cpp	(revision 81286)
+++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageControlVM.cpp	(revision 81287)
@@ -513,4 +513,5 @@
             }
         }
+#ifdef VBOX_WITH_SHARED_CLIPBOARD
         else if (!strcmp(a->argv[1], "clipboard"))
         {
@@ -523,24 +524,58 @@
 
             ClipboardMode_T mode = ClipboardMode_Disabled; /* Shut up MSC */
-            if (!strcmp(a->argv[2], "disabled"))
-                mode = ClipboardMode_Disabled;
-            else if (!strcmp(a->argv[2], "hosttoguest"))
-                mode = ClipboardMode_HostToGuest;
-            else if (!strcmp(a->argv[2], "guesttohost"))
-                mode = ClipboardMode_GuestToHost;
-            else if (!strcmp(a->argv[2], "bidirectional"))
-                mode = ClipboardMode_Bidirectional;
-            else
-            {
-                errorArgument("Invalid '%s' argument '%s'.", a->argv[1], a->argv[2]);
-                rc = E_FAIL;
-            }
-            if (SUCCEEDED(rc))
-            {
+            if (!strcmp(a->argv[2], "mode"))
+            {
+                if (!strcmp(a->argv[3], "disabled"))
+                    mode = ClipboardMode_Disabled;
+                else if (!strcmp(a->argv[3], "hosttoguest"))
+                    mode = ClipboardMode_HostToGuest;
+                else if (!strcmp(a->argv[3], "guesttohost"))
+                    mode = ClipboardMode_GuestToHost;
+                else if (!strcmp(a->argv[3], "bidirectional"))
+                    mode = ClipboardMode_Bidirectional;
+                else
+                {
+                    errorArgument("Invalid '%s' argument '%s'.", a->argv[2], a->argv[3]);
+                    rc = E_FAIL;
+                    break;
+                }
+
                 CHECK_ERROR_BREAK(sessionMachine, COMSETTER(ClipboardMode)(mode));
                 if (SUCCEEDED(rc))
                     fNeedsSaving = true;
             }
-        }
+# ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
+            else if (!strcmp(a->argv[2], "filetransfers"))
+            {
+                if (a->argc <= 1 + 2)
+                {
+                    errorArgument("Missing argument to '%s'. Expected true / false.", a->argv[2]);
+                    rc = E_FAIL;
+                    break;
+                }
+
+                BOOL fEnabled;
+                if (!strcmp(a->argv[3], "enabled"))
+                {
+                    fEnabled = TRUE;
+                }
+                else if (!strcmp(a->argv[3], "disabled"))
+                {
+                    fEnabled = FALSE;
+                }
+                else
+                {
+                    errorArgument("Invalid '%s' argument '%s'.", a->argv[2], a->argv[3]);
+                    rc = E_FAIL;
+                    break;
+                }
+
+                CHECK_ERROR_BREAK(sessionMachine, COMSETTER(ClipboardFileTransfersEnabled)(fEnabled));
+                if (SUCCEEDED(rc))
+                    fNeedsSaving = true;
+            }
+# endif /* VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS */
+        }
+#endif /* VBOX_WITH_SHARED_CLIPBOARD */
         else if (!strcmp(a->argv[1], "draganddrop"))
         {
Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp	(revision 81286)
+++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp	(revision 81287)
@@ -697,8 +697,13 @@
                      "                            [--audiocontroller ac97|hda|sb16]\n"
                      "                            [--audiocodec stac9700|ad1980|stac9221|sb16]\n"
-                     "                            [--clipboard disabled|hosttoguest|guesttohost|\n"
-                     "                                         bidirectional]\n"
+#ifdef VBOX_WITH_SHARED_CLIPBOARD
+                     "                            [--clipboard-mode disabled|hosttoguest|guesttohost|\n"
+                     "                                              bidirectional]\n"
+# ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
+                     "                            [--clipboard-file-transfers enabled|disabled]\n"
+# endif
+#endif
                      "                            [--draganddrop disabled|hosttoguest|guesttohost|\n"
-                     "                                         bidirectional]\n");
+                     "                                           bidirectional]\n");
         RTStrmPrintf(pStrm,
                      "                            [--vrde on|off]\n"
@@ -852,8 +857,13 @@
                      "                            audioin on|off |\n"
                      "                            audioout on|off |\n"
-                     "                            clipboard disabled|hosttoguest|guesttohost|\n"
-                     "                                      bidirectional |\n"
+#ifdef VBOX_WITH_SHARED_CLIPBOARD
+                     "                            clipboard mode disabled|hosttoguest|guesttohost|\n"
+                     "                                           bidirectional |\n"
+# ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
+                     "                            clipboard filetransfers enabled|disabled |\n"
+# endif
+#endif
                      "                            draganddrop disabled|hosttoguest|guesttohost|\n"
-                     "                                      bidirectional |\n"
+                     "                                        bidirectional |\n"
                      "                            vrde on|off |\n"
                      "                            vrdeport <port> |\n"
Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp	(revision 81286)
+++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp	(revision 81287)
@@ -164,5 +164,10 @@
     MODIFYVM_AUDIOIN,
     MODIFYVM_AUDIOOUT,
-    MODIFYVM_CLIPBOARD,
+#ifdef VBOX_WITH_SHARED_CLIPBOARD
+    MODIFYVM_CLIPBOARD_MODE,
+# ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
+    MODIFYVM_CLIPBOARD_FILE_TRANSFERS,
+# endif
+#endif
     MODIFYVM_DRAGANDDROP,
     MODIFYVM_VRDPPORT,                /* VRDE: deprecated */
@@ -354,5 +359,10 @@
     { "--audioin",                  MODIFYVM_AUDIOIN,                   RTGETOPT_REQ_BOOL_ONOFF },
     { "--audioout",                 MODIFYVM_AUDIOOUT,                  RTGETOPT_REQ_BOOL_ONOFF },
-    { "--clipboard",                MODIFYVM_CLIPBOARD,                 RTGETOPT_REQ_STRING },
+#ifdef VBOX_WITH_SHARED_CLIPBOARD
+    { "--clipboard-mode",           MODIFYVM_CLIPBOARD_MODE,            RTGETOPT_REQ_STRING },
+# ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
+    { "--clipboard-file-transfers", MODIFYVM_CLIPBOARD_FILE_TRANSFERS,  RTGETOPT_REQ_STRING },
+# endif
+#endif
     { "--draganddrop",              MODIFYVM_DRAGANDDROP,               RTGETOPT_REQ_STRING },
     { "--vrdpport",                 MODIFYVM_VRDPPORT,                  RTGETOPT_REQ_STRING },     /* deprecated */
@@ -2438,5 +2448,6 @@
             }
 
-            case MODIFYVM_CLIPBOARD:
+#ifdef VBOX_WITH_SHARED_CLIPBOARD
+            case MODIFYVM_CLIPBOARD_MODE:
             {
                 ClipboardMode_T mode = ClipboardMode_Disabled; /* Shut up MSC */
@@ -2451,5 +2462,5 @@
                 else
                 {
-                    errorArgument("Invalid --clipboard argument '%s'", ValueUnion.psz);
+                    errorArgument("Invalid --clipboard-mode argument '%s'", ValueUnion.psz);
                     rc = E_FAIL;
                 }
@@ -2460,4 +2471,26 @@
                 break;
             }
+
+# ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
+            case MODIFYVM_CLIPBOARD_FILE_TRANSFERS:
+            {
+                BOOL fEnabled;
+                if (!RTStrICmp(ValueUnion.psz, "enabled"))
+                    fEnabled = true;
+                else if (!RTStrICmp(ValueUnion.psz, "disabled"))
+                    fEnabled = false;
+                else
+                {
+                    errorArgument("Invalid --clipboard-file-transfers argument '%s'", ValueUnion.psz);
+                    rc = E_FAIL;
+                }
+                if (SUCCEEDED(rc))
+                {
+                    CHECK_ERROR(sessionMachine, COMSETTER(ClipboardFileTransfersEnabled)(fEnabled));
+                }
+                break;
+            }
+# endif /* VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS */
+#endif /* VBOX_WITH_SHARED_CLIPBOARD */
 
             case MODIFYVM_DRAGANDDROP: