diff --git a/docs/changes.txt b/docs/changes.txt
index a80abe10f..35e79748c 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -63,6 +63,7 @@
 - Kernels: Add standalone true UTF8 to UTF16 converter kernel that runs after amplifier. Use OPTS_TYPE_POST_AMP_UTF16LE from plugin
 - Modules: Recategorized HASH_CATEGORY option in various modules
 - Modules: Added hash categories HASH_CATEGORY_IMS and HASH_CATEGORY_CRYPTOCURRENCY_WALLET
+- Modules: Changed hash category of Python passlib from HASH_CATEGORY_GENERIC_KDF to HASH_CATEGORY_FRAMEWORK
 
 * changes v6.2.0 -> v6.2.1
 
diff --git a/docs/readme.txt b/docs/readme.txt
index d029c78c4..092028b09 100644
--- a/docs/readme.txt
+++ b/docs/readme.txt
@@ -146,9 +146,6 @@ NVIDIA GPUs require "NVIDIA Driver" (440.64 or later) and "CUDA Toolkit" (9.0 or
 - PBKDF2-HMAC-SHA1
 - PBKDF2-HMAC-SHA256
 - PBKDF2-HMAC-SHA512
-- Python passlib pbkdf2-sha512
-- Python passlib pbkdf2-sha256
-- Python passlib pbkdf2-sha1
 - scrypt
 - phpass
 - TACACS+
@@ -356,6 +353,9 @@ NVIDIA GPUs require "NVIDIA Driver" (440.64 or later) and "CUDA Toolkit" (9.0 or
 - Django (SHA-1)
 - Atlassian (PBKDF2-HMAC-SHA1)
 - Ruby on Rails Restful-Authentication
+- Python passlib pbkdf2-sha512
+- Python passlib pbkdf2-sha256
+- Python passlib pbkdf2-sha1
 - PKCS#8 Private Keys (PBKDF2-HMAC-SHA1 + 3DES/AES)
 - PKCS#8 Private Keys (PBKDF2-HMAC-SHA256 + 3DES/AES)
 - JKS Java Key Store Private Keys (SHA1)
diff --git a/src/modules/module_20200.c b/src/modules/module_20200.c
index 912a33b26..9f18dc7d9 100644
--- a/src/modules/module_20200.c
+++ b/src/modules/module_20200.c
@@ -16,7 +16,7 @@ static const u32   DGST_POS1      = 1;
 static const u32   DGST_POS2      = 2;
 static const u32   DGST_POS3      = 3;
 static const u32   DGST_SIZE      = DGST_SIZE_8_16;
-static const u32   HASH_CATEGORY  = HASH_CATEGORY_GENERIC_KDF;
+static const u32   HASH_CATEGORY  = HASH_CATEGORY_FRAMEWORK;
 static const char *HASH_NAME      = "Python passlib pbkdf2-sha512";
 static const u64   KERN_TYPE      = 7100;
 static const u32   OPTI_TYPE      = OPTI_TYPE_ZERO_BYTE
diff --git a/src/modules/module_20300.c b/src/modules/module_20300.c
index 6254a00f3..0624b8dce 100644
--- a/src/modules/module_20300.c
+++ b/src/modules/module_20300.c
@@ -16,7 +16,7 @@ static const u32   DGST_POS1      = 1;
 static const u32   DGST_POS2      = 2;
 static const u32   DGST_POS3      = 3;
 static const u32   DGST_SIZE      = DGST_SIZE_4_64;
-static const u32   HASH_CATEGORY  = HASH_CATEGORY_GENERIC_KDF;
+static const u32   HASH_CATEGORY  = HASH_CATEGORY_FRAMEWORK;
 static const char *HASH_NAME      = "Python passlib pbkdf2-sha256";
 static const u64   KERN_TYPE      = 10900;
 static const u32   OPTI_TYPE      = OPTI_TYPE_ZERO_BYTE
diff --git a/src/modules/module_20400.c b/src/modules/module_20400.c
index 2a221e9ff..5df332861 100644
--- a/src/modules/module_20400.c
+++ b/src/modules/module_20400.c
@@ -16,7 +16,7 @@ static const u32   DGST_POS1      = 1;
 static const u32   DGST_POS2      = 2;
 static const u32   DGST_POS3      = 3;
 static const u32   DGST_SIZE      = DGST_SIZE_4_32;
-static const u32   HASH_CATEGORY  = HASH_CATEGORY_GENERIC_KDF;
+static const u32   HASH_CATEGORY  = HASH_CATEGORY_FRAMEWORK;
 static const char *HASH_NAME      = "Python passlib pbkdf2-sha1";
 static const u64   KERN_TYPE      = 12000;
 static const u32   OPTI_TYPE      = OPTI_TYPE_ZERO_BYTE