diff --git a/docs/changes.txt b/docs/changes.txt
index 313914aa5..d36574427 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -19,6 +19,7 @@
 ##
 
 - Blake Kernels: Optimize BLAKE2B_ROUND() 64 bit rotates giving a 5% performance increase
+- Brain Session: Adds hashconfig specific opti_type and opts_type parameters to hashcat session computation to cover features like -O and -M
 - Shared Memory: Calculate kernel dynamic memory size based on CU_DEVICE_ATTRIBUTE_MAX_SHARED_MEMORY_PER_BLOCK_OPTIN
 - Slow Kernels: Set some of the slowest kernels to OPTS_TYPE_MP_MULTI_DISABLE
 
diff --git a/src/brain.c b/src/brain.c
index 64e3578ae..2962eaa2e 100644
--- a/src/brain.c
+++ b/src/brain.c
@@ -172,6 +172,14 @@ u32 brain_compute_attack (hashcat_ctx_t *hashcat_ctx)
 
   XXH64_update (state, &hex_salt, sizeof (hex_salt));
 
+  const u32 opti_type = hashconfig->opti_type;
+
+  XXH64_update (state, &opti_type, sizeof (opti_type));
+
+  const u64 opts_type = hashconfig->opts_type;
+
+  XXH64_update (state, &opts_type, sizeof (opts_type));
+
   const int hccapx_message_pair = user_options->hccapx_message_pair;
 
   XXH64_update (state, &hccapx_message_pair, sizeof (hccapx_message_pair));