diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Changelog for `wai-saml2`
 
-## Unreleased changes
+## 0.6
+
+-   Switch from `x509-*` to `crypton-x509-*` ([#50](https://github.com/mbg/wai-saml2/pull/50) by [@mbg](https://github.com/mbg)).
 
 ## 0.5
 
diff --git a/wai-saml2.cabal b/wai-saml2.cabal
--- a/wai-saml2.cabal
+++ b/wai-saml2.cabal
@@ -1,11 +1,11 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
 
 name:           wai-saml2
-version:        0.5
+version:        0.6
 synopsis:       SAML2 assertion validation as WAI middleware
 description:    A Haskell library which implements SAML2 assertion validation as WAI middleware
 category:       Security
@@ -65,23 +65,23 @@
       base >=4.8 && <5
     , base16-bytestring >=0.1 && <1.1
     , base64-bytestring >=0.1 && <2
-    , bytestring >=0.9 && <0.12
+    , bytestring >=0.9 && <0.13
     , c14n >=0.1.0.1 && <1
-    , containers ==0.6.*
-    , cryptonite <1
+    , containers >=0.6 && <0.8
+    , crypton <2
+    , crypton-x509 <2
+    , crypton-x509-store <2
     , data-default-class <1
     , http-types <1
     , mtl >=2.2.1 && <3
     , network-uri >=2.0 && <3
-    , text <2.1
+    , text <2.2
     , time >=1.9 && <2
     , vault >=0.3 && <1
     , wai >=3.0 && <4
     , wai-extra >=3.0 && <4
-    , x509 <2
-    , x509-store <2
     , xml-conduit <2
-    , zlib >=0.6.0.0 && <0.7
+    , zlib >=0.6.0.0 && <0.8
   default-language: Haskell2010
 
 test-suite parser
@@ -102,8 +102,10 @@
     , base64-bytestring >=0.1 && <2
     , bytestring
     , c14n >=0.1.0.1 && <1
-    , containers ==0.6.*
-    , cryptonite <1
+    , containers >=0.6 && <0.8
+    , crypton <2
+    , crypton-x509 <2
+    , crypton-x509-store <2
     , data-default-class <1
     , filepath
     , http-types <1
@@ -112,14 +114,12 @@
     , pretty-show
     , tasty
     , tasty-golden
-    , text <2.1
+    , text <2.2
     , time >=1.9 && <2
     , vault >=0.3 && <1
     , wai >=3.0 && <4
     , wai-extra >=3.0 && <4
     , wai-saml2
-    , x509 <2
-    , x509-store <2
     , xml-conduit
-    , zlib >=0.6.0.0 && <0.7
+    , zlib >=0.6.0.0 && <0.8
   default-language: Haskell2010