diff -r fa66577f6807 Doc/library/socket.rst
--- a/Doc/library/socket.rst	Thu Sep 10 13:25:17 2015 +0200
+++ b/Doc/library/socket.rst	Thu Sep 10 09:03:40 2015 -0400
@@ -349,6 +349,24 @@
    This constant contains a boolean value which indicates if IPv6 is supported on
    this platform.
 
+.. data:: BDADDR_ANY
+          BDADDR_ALL
+          BDADDR_LOCAL
+
+   These are string constants containing Bluetooth addresses with special
+   meanings. For example, BDADDR_ANY can be used to indicate any address when
+   specifying the binding socket with BTPROTO_RFCOMM.
+
+   .. versionchanged:: 3.6
+      BDADDR_ALL was added
+
+.. data:: HCI_FILTER
+          HCI_TIME_STAMP
+          HCI_DATA_DIR
+
+   For use with BTPROTO_HCI. HCI_FILTER is not available for NetBSD or
+   DragonFlyBSD. HCI_TIME_STAMP and HCI_DATA_DIR are not available for
+   FreeBSD, NetBSD, or DragonFlyBSD.
 
 Functions
 ^^^^^^^^^
diff -r fa66577f6807 Modules/socketmodule.c
--- a/Modules/socketmodule.c	Thu Sep 10 13:25:17 2015 +0200
+++ b/Modules/socketmodule.c	Thu Sep 10 09:03:40 2015 -0400
@@ -6295,6 +6295,7 @@
 #endif
     PyModule_AddIntMacro(m, BTPROTO_RFCOMM);
     PyModule_AddStringConstant(m, "BDADDR_ANY", "00:00:00:00:00:00");
+    PyModule_AddStringConstant(m, "BDADDR_ALL", "FF:FF:FF:FF:FF:FF");
     PyModule_AddStringConstant(m, "BDADDR_LOCAL", "00:00:00:FF:FF:FF");
 #endif