diff --git a/cmdgen.c b/cmdgen.c
index 409b4c5b..e9a17093 100644
--- a/cmdgen.c
+++ b/cmdgen.c
@@ -157,7 +157,7 @@ void help(void)
            "default 3)\n"
            "            kdf           key derivation function (argon2id, "
            "argon2i, argon2d)\n"
-           "            memory        Kb of memory to use in password hash "
+           "            memory        Kbyte of memory to use in password hash "
            "(default 8192)\n"
            "            time          approx milliseconds to hash for "
            "(default 100)\n"
diff --git a/doc/pubkeyfmt.but b/doc/pubkeyfmt.but
index d1c92d6d..78da4885 100644
--- a/doc/pubkeyfmt.but
+++ b/doc/pubkeyfmt.but
@@ -124,7 +124,7 @@ passphrase:
 password-hashing function.
 
 The three integer values are used as parameters for Argon2, which
-allows you to configure the amount of memory used (in Kb), the number
+allows you to configure the amount of memory used (in Kbyte), the number
 of passes of the algorithm to run (to tune its running time), and the
 degree of parallelism required by the hash function. The salt is
 decoded into a sequence of binary bytes and used as an additional
diff --git a/ssh.h b/ssh.h
index 08c6797c..49ab2796 100644
--- a/ssh.h
+++ b/ssh.h
@@ -1242,7 +1242,7 @@ typedef struct ppk_save_parameters {
      * Parameters for fmt_version == 3
      */
     Argon2Flavour argon2_flavour;
-    uint32_t argon2_mem;               /* in Kb */
+    uint32_t argon2_mem;               /* in Kbyte */
     bool argon2_passes_auto;
     union {
         uint32_t argon2_passes;        /* if auto == false */
diff --git a/test/cryptsuite.py b/test/cryptsuite.py
index b1eb2818..757de673 100755
--- a/test/cryptsuite.py
+++ b/test/cryptsuite.py
@@ -1932,7 +1932,7 @@ culpa qui officia deserunt mollit anim id est laborum.
         secret = b"secret"
         assoc = b"associated data"
 
-        # Smallest memory (8Kb) and parallelism (1) parameters the
+        # Smallest memory (8Kbyte) and parallelism (1) parameters the
         # reference implementation will accept, but lots of passes
         self.assertEqualBin(
             argon2('i', 8, 16, 1, 24, pwd, salt, secret, assoc), unhex(
diff --git a/windows/puttygen.rc b/windows/puttygen.rc
index 9d15015d..1209ec48 100644
--- a/windows/puttygen.rc
+++ b/windows/puttygen.rc
@@ -69,7 +69,7 @@ BEGIN
     LTEXT "Memory to use for password hash:", IDC_ARGON2_MEM_STATIC,
         5, 36, 115, 8
     EDITTEXT IDC_ARGON2_MEM, 120, 34, 40, 12
-    LTEXT "Kb", IDC_ARGON2_MEM_STATIC2, 170, 36, 34, 8
+    LTEXT "Kbyte", IDC_ARGON2_MEM_STATIC2, 170, 36, 34, 8
     LTEXT "Time to use for password hash:", IDC_ARGON2_TIME_STATIC,
         5, 50, 115, 8
     EDITTEXT IDC_ARGON2_TIME, 120, 48, 40, 12