diff --git a/library/x509.c b/library/x509.c
index 57dfd64..7b5ec5f 100644
--- a/library/x509.c
+++ b/library/x509.c
@@ -137,7 +137,7 @@
     return( 0 );
 }
 
-#if defined(POLARSSL_RSASSA_PSS_CERTIFICATES)
+#if defined(POLARSSL_X509_RSASSA_PSS_SUPPORT)
 /*
  * HashAlgorithm ::= AlgorithmIdentifier
  *
@@ -338,7 +338,7 @@
 
     return( 0 );
 }
-#endif /* POLARSSL_RSASSA_PSS_CERTIFICATES */
+#endif /* POLARSSL_X509_RSASSA_PSS_SUPPORT */
 
 /*
  *  AttributeTypeAndValue ::= SEQUENCE {
@@ -570,7 +570,7 @@
     if( ( ret = oid_get_sig_alg( sig_oid, md_alg, pk_alg ) ) != 0 )
         return( POLARSSL_ERR_X509_UNKNOWN_SIG_ALG + ret );
 
-#if defined(POLARSSL_RSASSA_PSS_CERTIFICATES)
+#if defined(POLARSSL_X509_RSASSA_PSS_SUPPORT)
     if( *pk_alg == POLARSSL_PK_RSASSA_PSS )
     {
         pk_rsassa_pss_options *pss_opts;
@@ -854,7 +854,7 @@
         ret = snprintf( p, n, "%s", desc );
     SAFE_SNPRINTF();
 
-#if defined(POLARSSL_RSASSA_PSS_CERTIFICATES)
+#if defined(POLARSSL_X509_RSASSA_PSS_SUPPORT)
     if( pk_alg == POLARSSL_PK_RSASSA_PSS )
     {
         const pk_rsassa_pss_options *pss_opts;
@@ -875,7 +875,7 @@
     ((void) pk_alg);
     ((void) md_alg);
     ((void) sig_opts);
-#endif /* POLARSSL_RSASSA_PSS_CERTIFICATES */
+#endif /* POLARSSL_X509_RSASSA_PSS_SUPPORT */
 
     return( (int) size - n );
 }
diff --git a/library/x509_crl.c b/library/x509_crl.c
index 2191b47..8035ee4 100644
--- a/library/x509_crl.c
+++ b/library/x509_crl.c
@@ -716,7 +716,7 @@
 
     do
     {
-#if defined(POLARSSL_RSASSA_PSS_CERTIFICATES)
+#if defined(POLARSSL_X509_RSASSA_PSS_SUPPORT)
         polarssl_free( crl_cur->sig_opts );
 #endif
 
diff --git a/library/x509_crt.c b/library/x509_crt.c
index 315d98b..fa09596 100644
--- a/library/x509_crt.c
+++ b/library/x509_crt.c
@@ -1921,7 +1921,7 @@
     {
         pk_free( &cert_cur->pk );
 
-#if defined(POLARSSL_RSASSA_PSS_CERTIFICATES)
+#if defined(POLARSSL_X509_RSASSA_PSS_SUPPORT)
         polarssl_free( cert_cur->sig_opts );
 #endif
 
diff --git a/library/x509_csr.c b/library/x509_csr.c
index 1c70a33..529e7e4 100644
--- a/library/x509_csr.c
+++ b/library/x509_csr.c
@@ -420,7 +420,7 @@
 
     pk_free( &csr->pk );
 
-#if defined(POLARSSL_RSASSA_PSS_CERTIFICATES)
+#if defined(POLARSSL_X509_RSASSA_PSS_SUPPORT)
     polarssl_free( csr->sig_opts );
 #endif