diff --git a/apps/docs/src/data/components/buttonToolbar.data.ts b/apps/docs/src/data/components/buttonToolbar.data.ts
index 466d96262..78fe5096c 100644
--- a/apps/docs/src/data/components/buttonToolbar.data.ts
+++ b/apps/docs/src/data/components/buttonToolbar.data.ts
@@ -1,5 +1,6 @@
 import type {BvnComponentProps} from 'bootstrap-vue-next'
 import type {ComponentReference, PropertyReference} from '../../types'
+import {buildCommonProps, pick} from '../../utils'
 
 export default {
   load: (): ComponentReference[] => [
@@ -7,25 +8,19 @@ export default {
       component: 'BButtonToolbar',
       props: {
         '': {
-          ariaLabel: {
-            type: 'string',
-            default: 'Group',
-          },
           justify: {
             type: 'boolean',
             default: false,
+            description:
+              'Make the toolbar span the maximum available width, by increasing spacing between the button groups, input groups and dropdowns',
           },
-          role: {
-            type: 'string',
-            default: 'toolbar',
-          },
+          ...pick(buildCommonProps(), ['ariaLabel', 'role']),
         } satisfies Record<keyof BvnComponentProps['BButtonToolbar'], PropertyReference>,
       },
       slots: [
         {
-          description: '',
           name: 'default',
-          scope: [],
+          description: 'Content to place in the button toolbar',
         },
       ],
       emits: [],
diff --git a/apps/docs/src/docs/migration-guide.md b/apps/docs/src/docs/migration-guide.md
index e247801d3..e2c18512b 100644
--- a/apps/docs/src/docs/migration-guide.md
+++ b/apps/docs/src/docs/migration-guide.md
@@ -173,6 +173,11 @@ details.
 The `content` and `text-variant` props have been deprecated since Bootstrap 5 moved to using an
 embedded svg for the close icon. See [their migration guide](https://getbootstrap.com/docs/5.3/migration/#close-button-1) for details.
 
+## BButtonToolbar
+
+[Keyboard navigation](https://bootstrap-vue.org/docs/components/button-toolbar#keyboard-navigation) is
+not implemented.
+
 ## BForm
 
 Bootstrap 5 has dropped form-specific layout classes for the grid system. See the