diff --git a/docs/changes.txt b/docs/changes.txt
index edee965e8..a5a6f9543 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -26,6 +26,7 @@
 - Fixed an invalid progress value in status view if words from the base wordlist get rejected because of length
 - Fixed a parser error for mode -m 9820 = MS Office <= 2003 $3, SHA1 + RC4, collider #2
 - Fixed a problem with changed current working directory, for instance by using --restore together with --remove
+- Fixed a problem with the conversion to the $HEX[] format: convert/hexify also all passwords of the format $HEX[]
 - Fixed the calculation of device_name_chksum; should be done for each iteration
 - Fixed the estimated time value whenever the value is very large and overflows
 - Fixed the parsing of command line options. It doesn't show two times the same error about an invalid option anymore
diff --git a/src/convert.c b/src/convert.c
index 3c2f591ff..079043780 100644
--- a/src/convert.c
+++ b/src/convert.c
@@ -152,6 +152,19 @@ bool need_hexify (const u8 *buf, const int len, const char separator, bool alway
     }
   }
 
+  // also test if the password is of the format $HEX[]:
+
+  if (rc == false)
+  {
+    if ((len & 1) == 0)
+    {
+      if (is_hexify (buf, len))
+      {
+        rc = true;
+      }
+    }
+  }
+
   return rc;
 }