diff --git a/scripts/generate_oxr_ext_support.py b/scripts/generate_oxr_ext_support.py
index 52e38eec5..66c51d634 100755
--- a/scripts/generate_oxr_ext_support.py
+++ b/scripts/generate_oxr_ext_support.py
@@ -71,6 +71,7 @@ EXTENSIONS = (
     ['XR_MNDX_egl_enable', 'XR_USE_PLATFORM_EGL', 'XR_USE_GRAPHICS_API_OPENGL'],
     ['XR_MNDX_force_feedback_curl'],
     ['XR_MNDX_hydra'],
+    ['XR_MNDX_system_buttons'],
 )
 
 
diff --git a/src/xrt/state_trackers/oxr/oxr_api_action.c b/src/xrt/state_trackers/oxr/oxr_api_action.c
index 97eb8b263..6ae233aec 100644
--- a/src/xrt/state_trackers/oxr/oxr_api_action.c
+++ b/src/xrt/state_trackers/oxr/oxr_api_action.c
@@ -351,6 +351,9 @@ oxr_xrSuggestInteractionProfileBindings(XrInstance instance,
 #endif
 	    .MNDX_ball_on_a_stick_controller = inst->extensions.MNDX_ball_on_a_stick_controller,
 	    .MNDX_hydra = inst->extensions.MNDX_hydra,
+#ifdef OXR_HAVE_MNDX_system_buttons
+	    .MNDX_system_buttons = inst->extensions.MNDX_system_buttons,
+#endif
 	    .EXT_eye_gaze_interaction = inst->extensions.EXT_eye_gaze_interaction,
 #ifdef OXR_HAVE_HTCX_vive_tracker_interaction
 	    .HTCX_vive_tracker_interaction = inst->extensions.HTCX_vive_tracker_interaction,
diff --git a/src/xrt/state_trackers/oxr/oxr_extension_support.h b/src/xrt/state_trackers/oxr/oxr_extension_support.h
index 9a39e78ad..2bd041d06 100644
--- a/src/xrt/state_trackers/oxr/oxr_extension_support.h
+++ b/src/xrt/state_trackers/oxr/oxr_extension_support.h
@@ -449,6 +449,17 @@
 #define OXR_EXTENSION_SUPPORT_MNDX_hydra(_)
 #endif
 
+
+/*
+ * XR_MNDX_system_buttons
+ */
+#if defined(XR_MNDX_system_buttons)
+#define OXR_HAVE_MNDX_system_buttons
+#define OXR_EXTENSION_SUPPORT_MNDX_system_buttons(_) _(MNDX_system_buttons, MNDX_SYSTEM_BUTTONS)
+#else
+#define OXR_EXTENSION_SUPPORT_MNDX_system_buttons(_)
+#endif
+
 // end of GENERATED per-extension defines - do not modify - used by scripts
 
 /*!
@@ -510,5 +521,6 @@
     OXR_EXTENSION_SUPPORT_MNDX_ball_on_a_stick_controller(_) \
     OXR_EXTENSION_SUPPORT_MNDX_egl_enable(_) \
     OXR_EXTENSION_SUPPORT_MNDX_force_feedback_curl(_) \
-    OXR_EXTENSION_SUPPORT_MNDX_hydra(_)
+    OXR_EXTENSION_SUPPORT_MNDX_hydra(_) \
+    OXR_EXTENSION_SUPPORT_MNDX_system_buttons(_)
 // clang-format on