diff --git a/programs/ssl/CMakeLists.txt b/programs/ssl/CMakeLists.txt
index 14b1d3e..f5c26d2 100644
--- a/programs/ssl/CMakeLists.txt
+++ b/programs/ssl/CMakeLists.txt
@@ -1,11 +1,19 @@
+set(libs
+     polarssl
+)
+
+if(USE_PKCS11_HELPER_LIBRARY)
+    set(libs ${libs} pkcs11-helper)
+endif(USE_PKCS11_HELPER_LIBRARY)
+
 add_executable(ssl_client1 ssl_client1.c)
-target_link_libraries(ssl_client1 polarssl)
+target_link_libraries(ssl_client1 ${libs})
 
 add_executable(ssl_client2 ssl_client2.c)
-target_link_libraries(ssl_client2 polarssl)
+target_link_libraries(ssl_client2 ${libs})
 
 add_executable(ssl_server ssl_server.c)
-target_link_libraries(ssl_server polarssl)
+target_link_libraries(ssl_server ${libs})
 
 INSTALL(TARGETS ssl_client1 ssl_client2 ssl_server
         DESTINATION "bin"
diff --git a/programs/test/CMakeLists.txt b/programs/test/CMakeLists.txt
index 9cd43ba..87f08c7 100644
--- a/programs/test/CMakeLists.txt
+++ b/programs/test/CMakeLists.txt
@@ -1,14 +1,22 @@
+set(libs
+     polarssl
+)
+
+if(USE_PKCS11_HELPER_LIBRARY)
+    set(libs ${libs} pkcs11-helper)
+endif(USE_PKCS11_HELPER_LIBRARY)
+
 add_executable(selftest selftest.c)
-target_link_libraries(selftest polarssl)
+target_link_libraries(selftest ${libs})
 
 add_executable(benchmark benchmark.c)
-target_link_libraries(benchmark polarssl)
+target_link_libraries(benchmark ${libs})
 
 add_executable(ssl_test ssl_test.c)
-target_link_libraries(ssl_test polarssl)
+target_link_libraries(ssl_test ${libs})
 
 add_executable(ssl_cert_test ssl_cert_test.c)
-target_link_libraries(ssl_cert_test polarssl)
+target_link_libraries(ssl_cert_test ${libs})
 
 INSTALL(TARGETS selftest benchmark ssl_test ssl_cert_test
         DESTINATION "bin"
diff --git a/programs/x509/CMakeLists.txt b/programs/x509/CMakeLists.txt
index 29e5854..872feb4 100644
--- a/programs/x509/CMakeLists.txt
+++ b/programs/x509/CMakeLists.txt
@@ -1,5 +1,13 @@
+set(libs
+     polarssl
+)
+
+if(USE_PKCS11_HELPER_LIBRARY)
+    set(libs ${libs} pkcs11-helper)
+endif(USE_PKCS11_HELPER_LIBRARY)
+
 add_executable(cert_app cert_app.c)
-target_link_libraries(cert_app polarssl)
+target_link_libraries(cert_app ${libs})
 
 INSTALL(TARGETS cert_app
         DESTINATION "bin"