diff --git a/README.adoc b/README.adoc
index 666471aed..ac4cb1c98 100644
--- a/README.adoc
+++ b/README.adoc
@@ -63,7 +63,7 @@ ciphers::
 
 key exchange::
   `diffie-hellman-group1-sha1`, `diffie-hellman-group14-sha1`, `diffie-hellman-group-exhange-sha1`, `diffie-hellman-group-exchange-sha256`,
-  `ecdh-sha2-nistp256`, `ecdh-sha2-nistp384`
+  `ecdh-sha2-nistp256`, `ecdh-sha2-nistp384`, `ecdh-sha2-nistp521`
 
 signatures::
   `ssh-rsa`, `ssh-dss`
@@ -94,7 +94,7 @@ Fork away!
 
 == Release history
 SSHJ 0.14.0 (2015-??-??)::
-* Added support for `ecdh-sha2-nistp256` and `ecdh-sha2-nistp384`
+* Added support for `ecdh-sha2-nistp256`, `ecdh-sha2-nistp384` and  `ecdh-sha2-nistp521`
 * Fixed https://github.com/hierynomus/sshj/issues/167[#167]: Added support for `diffie-hellman-group-exhange-sha1` and `diffie-hellman-group-exhange-sha256` key exchange methods
 * Fixed https://github.com/hierynomus/sshj/issues/212[#212]: Configure path escaping to enable shell expansion to work correctly
 * Merged https://github.com/hierynomus/sshj/issues/210[#210]: RemoteFileInputStream.skip returns wrong value (Fixes https://github.com/hierynomus/sshj/issues/209[#209])
diff --git a/src/main/java/net/schmizz/sshj/DefaultConfig.java b/src/main/java/net/schmizz/sshj/DefaultConfig.java
index 54c99db0e..e1f04e45b 100644
--- a/src/main/java/net/schmizz/sshj/DefaultConfig.java
+++ b/src/main/java/net/schmizz/sshj/DefaultConfig.java
@@ -102,8 +102,8 @@ protected void initKeyExchangeFactories(boolean bouncyCastleRegistered) {
                     new DHGexSHA1.Factory(),
                     new DHGexSHA256.Factory(),
                     new ECDHNistP.Factory256(),
-                    new ECDHNistP.Factory384());
-                    // TODO 521 fails sometimes with key verification errors new ECDHNistP.Factory521());
+                    new ECDHNistP.Factory384(),
+                    new ECDHNistP.Factory521());
         else
             setKeyExchangeFactories(new DHG1.Factory(), new DHGexSHA1.Factory());
     }