diff --git a/include/polarssl/check_config.h b/include/polarssl/check_config.h
index 4f3e48c..328b881 100644
--- a/include/polarssl/check_config.h
+++ b/include/polarssl/check_config.h
@@ -197,9 +197,9 @@
 #error "POLARSSL_RSA_C defined, but not all prerequisites"
 #endif
 
-#if defined(POLARSSL_RSASSA_PSS_CERTIFICATES) &&                        \
+#if defined(POLARSSL_X509_RSASSA_PSS_SUPPORT) &&                        \
     ( !defined(POLARSSL_RSA_C) || !defined(POLARSSL_PKCS1_V21) )
-#error "POLARSSL_RSASSA_PSS_CERTIFICATES defined, but not all prerequisites"
+#error "POLARSSL_X509_RSASSA_PSS_SUPPORT defined, but not all prerequisites"
 #endif
 
 #if defined(POLARSSL_SSL_PROTO_SSL3) && ( !defined(POLARSSL_MD5_C) ||     \
diff --git a/include/polarssl/config.h b/include/polarssl/config.h
index 1d15338..0dca560 100644
--- a/include/polarssl/config.h
+++ b/include/polarssl/config.h
@@ -221,16 +221,6 @@
 //#define POLARSSL_SHA512_ALT
 
 /**
- * \def POLARSSL_RSASSA_PSS_CERTIFICATES
- *
- * Enable parsing and verification of X.509 certificates, CRLs and CSRS
- * signed with RSASSA-PSS (aka PKCS#1 v2.1).
- *
- * Comment this macro to disallow using RSASSA-PSS in certificates.
- */
-#define POLARSSL_RSASSA_PSS_CERTIFICATES
-
-/**
  * \def POLARSSL_AES_ROM_TABLES
  *
  * Store the AES tables in ROM.
@@ -1026,6 +1016,16 @@
 #define POLARSSL_X509_CHECK_EXTENDED_KEY_USAGE
 
 /**
+ * \def POLARSSL_X509_RSASSA_PSS_SUPPORT
+ *
+ * Enable parsing and verification of X.509 certificates, CRLs and CSRS
+ * signed with RSASSA-PSS (aka PKCS#1 v2.1).
+ *
+ * Comment this macro to disallow using RSASSA-PSS in certificates.
+ */
+#define POLARSSL_X509_RSASSA_PSS_SUPPORT
+
+/**
  * \def POLARSSL_ZLIB_SUPPORT
  *
  * If set, the SSL/TLS module uses ZLIB to support compression and
diff --git a/include/polarssl/x509.h b/include/polarssl/x509.h
index bd34617..583cb83 100644
--- a/include/polarssl/x509.h
+++ b/include/polarssl/x509.h
@@ -278,7 +278,7 @@
                        x509_buf *alg );
 int x509_get_alg( unsigned char **p, const unsigned char *end,
                   x509_buf *alg, x509_buf *params );
-#if defined(POLARSSL_RSASSA_PSS_CERTIFICATES)
+#if defined(POLARSSL_X509_RSASSA_PSS_SUPPORT)
 int x509_get_rsassa_pss_params( const x509_buf *params,
                                 md_type_t *md_alg, md_type_t *mgf_md,
                                 int *salt_len );