diff --git a/apps/features.txt b/apps/features.txt
index c323c1cf55..e40273e98b 100644
--- a/apps/features.txt
+++ b/apps/features.txt
@@ -191,3 +191,8 @@ serial_port
 #if defined(HAVE_SPEAKER)
 speaker
 #endif
+
+#if defined(HAVE_USBSTACK) && defined(USE_ROCKBOX_USB)
+usbstack
+#endif
+
diff --git a/manual/rockbox_interface/main.tex b/manual/rockbox_interface/main.tex
index 3718ddb1fb..eed7aec370 100644
--- a/manual/rockbox_interface/main.tex
+++ b/manual/rockbox_interface/main.tex
@@ -641,6 +641,14 @@ garbled.}
 {
     \section{Charging}
     The \dap{} can be powered over USB without connecting to your computer by holding \ActionStdUsbCharge{} while plugging in. This allows you to continue using the \dap{} normally.
+    \opt{usbstack}
+    {
+        \nopt{gigabeats}
+        {
+            \section{USB disconnect}
+            As soon as the operating system of your computer marks the \dap{} as unused (e.g. after you eject or safely remove the device), you can switch the device to Charging mode by pressing \ActionStdUsbCharge{}. Pressing \ActionStdUsbCharge{} while the host operating is still actively communicating with the \dap{} has no effect.
+        }
+    }
 }
 
 \input{rockbox_interface/browsing_and_playing.tex}