diff --git a/include/polarssl/config.h b/include/polarssl/config.h
index 7a570e0be..65be2bd00 100644
--- a/include/polarssl/config.h
+++ b/include/polarssl/config.h
@@ -141,6 +141,15 @@
  *      TLS_RSA_WITH_NULL_SHA
  *      TLS_RSA_WITH_NULL_SHA256
  *      TLS_ECDHE_RSA_WITH_NULL_SHA
+ *      TLS_PSK_WITH_NULL
+ *      TLS_PSK_WITH_NULL256
+ *      TLS_PSK_WITH_NULL384
+ *      TLS_DHE_PSK_WITH_NULL
+ *      TLS_DHE_PSK_WITH_NULL256
+ *      TLS_DHE_PSK_WITH_NULL384
+ *      TLS_RSA_PSK_WITH_NULL
+ *      TLS_RSA_PSK_WITH_NULL256
+ *      TLS_RSA_PSK_WITH_NULL384
  *
  * Uncomment this macro to enable the NULL cipher and ciphersuites
 #define POLARSSL_CIPHER_NULL_CIPHER
@@ -172,6 +181,10 @@
  *      TLS_PSK_WITH_3DES_EDE_CBC_SHA
  *      TLS_PSK_WITH_AES_128_CBC_SHA
  *      TLS_PSK_WITH_AES_256_CBC_SHA
+ *      TLS_PSK_WITH_AES_128_CBC_SHA256
+ *      TLS_PSK_WITH_AES_256_CBC_SHA384
+ *      TLS_PSK_WITH_AES_128_GCM_SHA256
+ *      TLS_PSK_WITH_AES_256_GCM_SHA384
  */
 #define POLARSSL_KEY_EXCHANGE_PSK_ENABLED
 
@@ -188,6 +201,10 @@
  *      TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA
  *      TLS_DHE_PSK_WITH_AES_128_CBC_SHA
  *      TLS_DHE_PSK_WITH_AES_256_CBC_SHA
+ *      TLS_DHE_PSK_WITH_AES_128_CBC_SHA256
+ *      TLS_DHE_PSK_WITH_AES_256_CBC_SHA384
+ *      TLS_DHE_PSK_WITH_AES_128_GCM_SHA256
+ *      TLS_DHE_PSK_WITH_AES_256_GCM_SHA384
  */
 #define POLARSSL_KEY_EXCHANGE_DHE_PSK_ENABLED
 
@@ -195,7 +212,7 @@
  * \def POLARSSL_KEY_EXCHANGE_RSA_PSK_ENABLED
  *
  * Enable the RSA-PSK based ciphersuite modes in SSL / TLS
- *
+ * (NOT YET IMPLEMENTED)
  * Requires: POLARSSL_RSA_C, POLARSSL_X509_PARSE_C
  *
  * This enables the following ciphersuites (if other requisites are
@@ -204,6 +221,10 @@
  *      TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA
  *      TLS_RSA_PSK_WITH_AES_128_CBC_SHA
  *      TLS_RSA_PSK_WITH_AES_256_CBC_SHA
+ *      TLS_RSA_PSK_WITH_AES_128_CBC_SHA256
+ *      TLS_RSA_PSK_WITH_AES_256_CBC_SHA384
+ *      TLS_RSA_PSK_WITH_AES_128_GCM_SHA256
+ *      TLS_RSA_PSK_WITH_AES_256_GCM_SHA384
 #define POLARSSL_KEY_EXCHANGE_RSA_PSK_ENABLED
  */