diff --git a/OpenCL/m26900-pure.cl b/OpenCL/m26900-pure.cl
index 46e2614fa..3b63483fa 100644
--- a/OpenCL/m26900-pure.cl
+++ b/OpenCL/m26900-pure.cl
@@ -30,6 +30,11 @@
 #define SNMPV3_MAX_ENGINE_ELEMS     32  // 32 * 4 = 128 > 34, also has to be multiple of SNMPV3_MAX_PW_LENGTH
 #define SNMPV3_MAX_PNUM_ELEMS       4   // 4 * 4 = 16 > 9
 
+#define SNMPV3_MAX_PW_LENGTH_OPT    32
+#define SNMPV3_TMP_ELEMS_OPT        ((SNMPV3_MAX_PW_LENGTH_OPT * SNMPV3_MAX_PW_LENGTH) / 4)
+                                    // (32 * 128) / 4 = 1024
+                                    // for pw length > 32 we use global memory reads
+
 typedef struct hmac_sha384_tmp
 {
   u32 tmp[SNMPV3_TMP_ELEMS];
@@ -171,10 +176,7 @@ KERNEL_FQ void m26900_loop (KERN_ATTR_TMPS_ESALT (hmac_sha384_tmp_t, snmpv3_t))
 
   const int pw_len128 = pw_len * 128;
 
-  #define SNMPV3_TMP_ELEMS_OPT 8192 // 8192 = (128 max pw length * 64) / sizeof (u32)
-                                    // for pw length > 128 we use global memory reads
-
-  if (pw_len < 128)
+  if (pw_len <= SNMPV3_MAX_PW_LENGTH_OPT)
   {
     u32 tmp[SNMPV3_TMP_ELEMS_OPT];
 
diff --git a/docs/changes.txt b/docs/changes.txt
index af5807bae..7e0aab1a2 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -39,7 +39,6 @@
 
 - Added hash-mode: SNMPv3 HMAC-SHA1-96
 - Added hash-mode: SNMPv3 HMAC-MD5-96
-- Added hash-mode: SNMPv3 HMAC-SHA384-256
 
 * changes v6.2.2 -> v6.2.3
 
diff --git a/docs/readme.txt b/docs/readme.txt
index c93c04a92..cff519531 100644
--- a/docs/readme.txt
+++ b/docs/readme.txt
@@ -157,7 +157,6 @@ NVIDIA GPUs require "NVIDIA Driver" (440.64 or later) and "CUDA Toolkit" (9.0 or
 - IKE-PSK SHA1
 - SNMPv3 HMAC-MD5-96
 - SNMPv3 HMAC-SHA1-96
-- SNMPv3 HMAC-SHA384-256
 - WPA-EAPOL-PBKDF2
 - WPA-EAPOL-PMK
 - WPA-PBKDF2-PMKID+EAPOL
diff --git a/src/modules/module_26900.c b/src/modules/module_26900.c
index dac7ad366..fef5aadbb 100644
--- a/src/modules/module_26900.c
+++ b/src/modules/module_26900.c
@@ -325,6 +325,7 @@ void module_init (module_ctx_t *module_ctx)
   module_ctx->module_esalt_size               = module_esalt_size;
   module_ctx->module_extra_buffer_size        = MODULE_DEFAULT;
   module_ctx->module_extra_tmp_size           = MODULE_DEFAULT;
+  module_ctx->module_extra_tuningdb_block     = MODULE_DEFAULT;
   module_ctx->module_forced_outfile_format    = MODULE_DEFAULT;
   module_ctx->module_hash_binary_count        = MODULE_DEFAULT;
   module_ctx->module_hash_binary_parse        = MODULE_DEFAULT;