diff --git a/features.conf b/features.conf
index 3058fc40..14ecc1b8 100644
--- a/features.conf
+++ b/features.conf
@@ -231,6 +231,8 @@ CONFIG_URI_REWRITE=yes
 # the internal BitTorrent client and the internal client can always be forced
 # by prefixing the URI of the .torrent file with "bittorrent:"
 # 
+# NOTE: The BitTorrent support is still experimental.
+#
 # Default: disabled
 
 CONFIG_BITTORRENT=no