diff --git a/include/polarssl/config.h b/include/polarssl/config.h
index 0db1cd01d..a5e439653 100644
--- a/include/polarssl/config.h
+++ b/include/polarssl/config.h
@@ -1093,6 +1093,21 @@
  */
 #define POLARSSL_PEM_C
 
+/**
+ * \def POLARSSL_PK_C
+ *
+ * Enable the generic public (asymetric) key layer.
+ *
+ * Module:  library/pk.c
+ * Caller:  library/x509parse.c
+ *          library/ssl_tls.c
+ *          library/ssl_cli.c
+ *          library/ssl_srv.c
+ *
+ * Uncomment to enable generic public key wrappers.
+ */
+#define POLARSSL_PK_C
+
 /**
  * \def POLARSSL_PKCS5_C
  *
@@ -1248,7 +1263,7 @@
  * Caller:  library/ssl_cli.c
  *          library/ssl_srv.c
  *
- * Requires: POLARSSL_MD5_C, POLARSSL_SHA1_C, POLARSSL_CIPHER_C
+ * Requires: POLARSSL_MD5_C, POLARSSL_SHA1_C, POLARSSL_CIPHER_C, POLARSSL_PK_C
  *
  * This module is required for SSL/TLS.
  */
@@ -1288,7 +1303,7 @@
  *          library/ssl_tls.c
  *
  * Requires: POLARSSL_ASN1_PARSE_C, POLARSSL_BIGNUM_C, POLARSSL_OID_C,
- *           POLARSSL_RSA_C
+ *           POLARSSL_PK_C
  *
  * This module is required for X.509 certificate parsing.
  */
@@ -1483,7 +1498,8 @@
 #endif
 
 #if defined(POLARSSL_SSL_TLS_C) && ( !defined(POLARSSL_MD5_C) ||        \
-    !defined(POLARSSL_SHA1_C) || !defined(POLARSSL_CIPHER_C) )
+    !defined(POLARSSL_SHA1_C) || !defined(POLARSSL_CIPHER_C) ) ||       \
+    !defined(POLARSSL_PK_C)
 #error "POLARSSL_SSL_TLS_C defined, but not all prerequisites"
 #endif
 
@@ -1498,7 +1514,7 @@
 
 #if defined(POLARSSL_X509_PARSE_C) && ( !defined(POLARSSL_BIGNUM_C) ||  \
     !defined(POLARSSL_OID_C) || !defined(POLARSSL_ASN1_PARSE_C) ||      \
-    !defined(POLARSSL_RSA_C) )
+    !defined(POLARSSL_PK_C) )
 #error "POLARSSL_X509_PARSE_C defined, but not all prerequisites"
 #endif
 
diff --git a/library/pk.c b/library/pk.c
index e0a252f2b..0923afe45 100644
--- a/library/pk.c
+++ b/library/pk.c
@@ -25,6 +25,8 @@
 
 #include "polarssl/config.h"
 
+#if defined(POLARSSL_PK_C)
+
 #include "polarssl/pk.h"
 #include "polarssl/pk_wrap.h"
 
@@ -251,3 +253,5 @@ const char * pk_get_name( const pk_context *ctx )
 
     return( ctx->pk_info->name );
 }
+
+#endif /* POLARSSL_PK_C */
diff --git a/library/pk_wrap.c b/library/pk_wrap.c
index 9f650b631..7e8a3f192 100644
--- a/library/pk_wrap.c
+++ b/library/pk_wrap.c
@@ -25,6 +25,8 @@
 
 #include "polarssl/config.h"
 
+#if defined(POLARSSL_PK_C)
+
 #include "polarssl/pk_wrap.h"
 
 #if defined(POLARSSL_RSA_C)
@@ -410,3 +412,5 @@ const pk_info_t rsa_alt_info = {
     rsa_alt_free_wrap,
     NULL,
 };
+
+#endif /* POLARSSL_PK_C */