Index: /trunk/doc/manual/en_US/user_VBoxManage.xml
===================================================================
--- /trunk/doc/manual/en_US/user_VBoxManage.xml	(revision 37924)
+++ /trunk/doc/manual/en_US/user_VBoxManage.xml	(revision 37925)
@@ -1568,5 +1568,5 @@
                             --storagectl <name>
                             --port <number>
-                            --device <number>
+                            [--device <number>]
                             [--type dvddrive|hdd|fdd]
                             [--medium none|emptydrive|
@@ -1627,5 +1627,5 @@
           <glossdef>
             <para>The number of the port's device which is to be modified.
-            Mandatory.</para>
+            Optional. Default value is 0.</para>
           </glossdef>
         </glossentry>
Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxInternalManage.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VBoxManage/VBoxInternalManage.cpp	(revision 37924)
+++ /trunk/src/VBox/Frontends/VBoxManage/VBoxInternalManage.cpp	(revision 37925)
@@ -1254,5 +1254,5 @@
 
                 /** @todo the clipping below isn't 100% accurate, as it should
-                 * actually clip to the track size. However that's easier said
+                 * actually clip to the track size. However, that's easier said
                  * than done as figuring out the track size is heuristics. In
                  * any case the clipping is adjusted later after sorting, to
Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp	(revision 37924)
+++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp	(revision 37925)
@@ -459,5 +459,5 @@
                      "                            --storagectl <name>\n"
                      "                            --port <number>\n"
-                     "                            --device <number>\n"
+                     "                            [--device <number>]\n"
                      "                            [--type dvddrive|hdd|fdd]\n"
                      "                            [--medium none|emptydrive|\n"
Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageStorageController.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageStorageController.cpp	(revision 37924)
+++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageStorageController.cpp	(revision 37925)
@@ -75,5 +75,5 @@
     HRESULT rc = S_OK;
     ULONG port   = ~0U;
-    ULONG device = ~0U;
+    ULONG device = 0;                   /* device is optional, default is 0 */
     bool fForceUnmount = false;
     bool fSetMediumType = false;
@@ -288,6 +288,4 @@
     if (port == ~0U)
         return errorSyntax(USAGE_STORAGEATTACH, "Port not specified");
-    if (device == ~0U)
-        return errorSyntax(USAGE_STORAGEATTACH, "Device not specified");
 
     /* get the virtualbox system properties */