diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
index bb7d7ae62..6cb5680e8 100644
--- a/CHANGELOG.adoc
+++ b/CHANGELOG.adoc
@@ -3,6 +3,7 @@
 = History
 
 == 9.0.2
+* Added ASYNC_MQTT_BUILD_EXAMPLES_SEPARATE option to enable library separate build example. #359
 * Fixed TLS timeout logic. #357
 * Fixed broker auth file for docker. #356
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f2f85ffd1..3761ea73a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,6 +18,7 @@ option(ASYNC_MQTT_BUILD_UNIT_TESTS "Enable building unit tests" OFF)
 option(ASYNC_MQTT_BUILD_SYSTEM_TESTS "Enable building system tests" OFF)
 option(ASYNC_MQTT_BUILD_TOOLS "Enable building tools (broker, bench, etc.." OFF)
 option(ASYNC_MQTT_BUILD_EXAMPLES "Enable building example applications" OFF)
+option(ASYNC_MQTT_BUILD_EXAMPLES_SEPARATE "Enable building separate library build example applications(It requires much memory)" OFF)
 option(ASYNC_MQTT_BUILD_LIB "Enable building separate compilation library" OFF)
 
 # Not implemented yet
diff --git a/doc/CHANGELOG.html b/doc/CHANGELOG.html
index 060192746..9559a9e54 100644
--- a/doc/CHANGELOG.html
+++ b/doc/CHANGELOG.html
@@ -69,6 +69,9 @@ <h2 id="_9_0_2">9.0.2</h2>
 <div class="ulist">
 <ul>
 <li>
+<p>Added ASYNC_MQTT_BUILD_EXAMPLES_SEPARATE option to enable library separate build example. #359</p>
+</li>
+<li>
 <p>Fixed TLS timeout logic. #357</p>
 </li>
 <li>
diff --git a/doc/config.html b/doc/config.html
index afc8bfc02..b67731577 100644
--- a/doc/config.html
+++ b/doc/config.html
@@ -194,6 +194,10 @@ <h2 id="_cmake">cmake</h2>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Build examples</p></td>
 </tr>
 <tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">ASYNC_MQTT_BUILD_EXAMPLES_SEPARATE</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Build examples for separate library build. It requires much memory.</p></td>
+</tr>
+<tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">ASYNC_MQTT_BUILD_LIB</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Build separate compiled library</p></td>
 </tr>
diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt
index 261790071..78d7e8cd8 100644
--- a/example/CMakeLists.txt
+++ b/example/CMakeLists.txt
@@ -16,9 +16,10 @@ if("cxx_std_20" IN_LIST CMAKE_CXX_COMPILE_FEATURES)
         cl_cpp20coro_mqtt_sub.cpp
         ep_cpp20coro_mqtt_client.cpp
     )
-
-    add_subdirectory(separate_client)
-    add_subdirectory(separate_endpoint)
+    if(ASYNC_MQTT_BUILD_EXAMPLE_SEPARATE)
+        add_subdirectory(separate_client)
+        add_subdirectory(separate_endpoint)
+    endif()
 endif()
 
 if(ASYNC_MQTT_USE_TLS)