diff --git a/CMakeLists.txt b/CMakeLists.txt
index c39afb9d..c1418853 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -459,6 +459,13 @@ if (NOT PIP_FREERTOS)
 	add_executable(pip_test "main.cpp")
 	target_link_libraries(pip_test pip)
 	
+else(NOT PIP_FREERTOS)
+	message(STATUS "Building PIP with crypt support")
+	add_definitions(-DPIP_CRYPT)
+	add_library(pip_crypt ${PIP_LIB_TYPE} ${CPP_LIB_CRYPT})
+	target_link_libraries(pip_crypt pip ${sodium_FOUND})
+	list(APPEND LIBS_STATUS sodium)
+	list(APPEND PIP_LIBS_TARGETS pip_crypt)
 endif(NOT PIP_FREERTOS)
 
 # Install