diff --git a/ChangeLog.md b/ChangeLog.md
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,5 +1,9 @@
 # Revision history for cryptostore
 
+## 0.3.0.1 - 2023-06-25
+
+* Add optional flag to use crypton instead of cryptonite
+
 ## 0.3.0.0 - 2023-01-14
 
 * API change in PKCS5, PKCS8 and PKCS12 modules to handle better password-based
diff --git a/cryptostore.cabal b/cryptostore.cabal
--- a/cryptostore.cabal
+++ b/cryptostore.cabal
@@ -1,5 +1,5 @@
 name:                cryptostore
-version:             0.3.0.0
+version:             0.3.0.1
 synopsis:            Serialization of cryptographic data types
 description:         Haskell implementation of PKCS \#8, PKCS \#12 and CMS
                      (Cryptographic Message Syntax).
@@ -19,6 +19,11 @@
   type:     git
   location: https://github.com/ocheron/cryptostore
 
+flag use_crypton
+  description: Use crypton instead of cryptonite
+  manual: True
+  default: False
+
 library
   hs-source-dirs:      src
   exposed-modules:     Crypto.Store.CMS
@@ -56,11 +61,16 @@
                      , bytestring
                      , basement
                      , memory
-                     , cryptonite >= 0.26
                      , pem >= 0.1 && < 0.3
                      , asn1-types >= 0.3.1 && < 0.4
                      , asn1-encoding >= 0.9 && < 0.10
                      , hourglass >= 0.2
+  if flag(use_crypton)
+    build-depends:     crypton
+                     , crypton-x509
+                     , crypton-x509-validation
+  else
+    build-depends:     cryptonite >=0.26
                      , x509 >= 1.7.5
                      , x509-validation >= 1.5
   default-language:    Haskell2010
@@ -86,14 +96,18 @@
   build-depends:       base >= 4.9 && < 5
                      , bytestring
                      , asn1-types >= 0.3.1 && < 0.4
-                     , cryptonite >= 0.25
                      , memory
                      , tasty
                      , tasty-hunit
                      , tasty-quickcheck
                      , hourglass
                      , pem
-                     , x509
                      , cryptostore
+  if flag(use_crypton)
+    build-depends:     crypton
+                     , crypton-x509
+  else
+    build-depends:     cryptonite >=0.25
+                     , x509
   default-language:    Haskell2010
   ghc-options:         -Wall
diff --git a/src/Crypto/Store/PKCS5/PBES1.hs b/src/Crypto/Store/PKCS5/PBES1.hs
--- a/src/Crypto/Store/PKCS5/PBES1.hs
+++ b/src/Crypto/Store/PKCS5/PBES1.hs
@@ -92,7 +92,7 @@
 -- deriving a symmetric key on some systems, like the certificate export
 -- wizard on Windows.
 --
--- This value is different from @'toProtectionPassword ""'@ and can be tried
+-- This value is different from @'toProtectionPassword' ""@ and can be tried
 -- when decrypting content with a password known to be empty.
 emptyNotTerminated :: ProtectionPassword
 emptyNotTerminated = NullPassword