diff --git a/apps/features.txt b/apps/features.txt
index d3e433a..0bcfb23 100644
--- a/apps/features.txt
+++ b/apps/features.txt
@@ -197,7 +197,7 @@ tc_ramcache
 
 #if CONFIG_CHARGING
 charging
-#if defined(HAVE_USB_POWER)
+#if defined(HAVE_USB_CHARGING_ENABLE)
 usb_charging
 #endif
 #endif
diff --git a/manual/rockbox_interface/main.tex b/manual/rockbox_interface/main.tex
index 04045a9..abd3d44 100644
--- a/manual/rockbox_interface/main.tex
+++ b/manual/rockbox_interface/main.tex
@@ -610,10 +610,12 @@ To turn on and off your Rockbox enabled \dap{} use the following keys:
   }
 \subsection{Putting music on your \dap{}}
 
+\opt{usb_hid}{
 \note{Due to a bug in some OS X versions, the \dap{} can not be mounted, unless
     the USB HID feature is disabled. See \reference{ref:USB_HID} for more
     information.\newline
 }
+}
 
 With the \dap{} connected to the computer as an MSC/UMS device (like a
 USB Drive), music files can be put on the player via any standard file