diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index f1b7c74aba..ad671c7e1f 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -132,7 +132,7 @@ if(CMAKE_COMPILER_IS_GNUCC)
 endif(CMAKE_COMPILER_IS_GNUCC)
 
 if(CMAKE_COMPILER_IS_CLANG)
-    set(LIBS_C_FLAGS -Wmissing-declarations -Wdocumentation -Wno-documentation-deprecated-sync -Wunreachable-code)
+    set(LIBS_C_FLAGS -Wmissing-declarations -Wno-documentation-deprecated-sync -Wunreachable-code)
 endif(CMAKE_COMPILER_IS_CLANG)
 
 if(CMAKE_COMPILER_IS_MSVC)
diff --git a/tf-psa-crypto/CMakeLists.txt b/tf-psa-crypto/CMakeLists.txt
index 7b03958db0..88a0c61e8c 100644
--- a/tf-psa-crypto/CMakeLists.txt
+++ b/tf-psa-crypto/CMakeLists.txt
@@ -373,7 +373,7 @@ endfunction(tf_psa_crypto_set_gnu_extra_compile_options)
 function(tf_psa_crypto_set_clang_extra_compile_options target)
     target_compile_options(${target} PRIVATE
         -Wmissing-declarations
-        -Wdocumentation
+        # -Wdocumentation
         -Wno-documentation-deprecated-sync
         -Wunreachable-code
     )