diff --git a/docs/architecture/mbed-crypto-storage-specification.md b/docs/architecture/mbed-crypto-storage-specification.md
index e5547c324..87ccd748b 100644
--- a/docs/architecture/mbed-crypto-storage-specification.md
+++ b/docs/architecture/mbed-crypto-storage-specification.md
@@ -2,6 +2,8 @@ Mbed TLS storage specification
 =================================
 
 This document specifies how Mbed TLS uses storage.
+Key storage was originally introduced in a product called Mbed Crypto, which was re-distributed via Mbed TLS and has since been merged into Mbed TLS.
+This document contains historical information both from before and after this merge.
 
 Mbed TLS may be upgraded on an existing device with the storage preserved. Therefore:
 
diff --git a/scripts/config.py b/scripts/config.py
index 8ab75ade2..bc99d87a4 100755
--- a/scripts/config.py
+++ b/scripts/config.py
@@ -467,7 +467,7 @@ if __name__ == '__main__':
     def main():
         """Command line mbedtls_config.h manipulation tool."""
         parser = argparse.ArgumentParser(description="""
-        Mbed TLS and Mbed TLS configuration file manipulation tool.
+        Mbed TLS configuration file manipulation tool.
         """)
         parser.add_argument('--file', '-f',
                             help="""File to read (and modify if requested).