diff --git a/CMakeLists.txt b/CMakeLists.txt
index fda59429eec07dbc1c47d97474c651f877cb5f9a..18651ccb86dcb7bed67d1488cddcbe3196e8892c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -111,7 +111,8 @@ add_subdirectory(bindings)
 #------------------------------------------------------------------------------#
 # Examples
 #------------------------------------------------------------------------------#
-option(ADIOS2_BUILD_EXAMPLES "Build ADIOS examples" ON)
+option(ADIOS2_BUILD_EXAMPLES "Build examples" ON)
+option(ADIOS2_BUILD_EXAMPLES_EXPERIMENTAL "Build experimental examples" OFF)
 if(ADIOS2_BUILD_EXAMPLES)
   add_subdirectory(examples)
 endif()
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 0ea4819bccbfb48f061076bbadb16dac07818466..7f606ea7fa4baf827cb634a1a8a63cd710ee4b26 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -6,4 +6,7 @@
 add_subdirectory(basics)
 add_subdirectory(hello)
 add_subdirectory(heatTransfer)
-add_subdirectory(experimental)
+
+if(ADIOS2_BUILD_EXAMPLES_EXPERIMENTAL)
+  add_subdirectory(experimental)
+endif()
diff --git a/examples/experimental/CMakeLists.txt b/examples/experimental/CMakeLists.txt
index 95b0ee655839d8157bfe98495656d79e4066c236..00e3f8c9dc529346801dafaaf88e1c2ce6743225 100644
--- a/examples/experimental/CMakeLists.txt
+++ b/examples/experimental/CMakeLists.txt
@@ -6,3 +6,5 @@
 if(ADIOS2_HAVE_ADIOS1)
   add_subdirectory(multistep)
 endif()
+
+add_subdirectory(runtimeconfig)
diff --git a/examples/experimental/runtimeconfig/CMakeLists.txt b/examples/experimental/runtimeconfig/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..33bde8ad15c721c3e779238cf38beb9419ee77b2
--- /dev/null
+++ b/examples/experimental/runtimeconfig/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(hello)
diff --git a/examples/experimental/runtimeconfig/grandSchema.xml b/examples/experimental/runtimeconfig/configs/grandSchema.xml
similarity index 100%
rename from examples/experimental/runtimeconfig/grandSchema.xml
rename to examples/experimental/runtimeconfig/configs/grandSchema.xml
diff --git a/examples/experimental/runtimeconfig/multipleIOResolutions.xml b/examples/experimental/runtimeconfig/configs/multipleIOResolutions.xml
similarity index 100%
rename from examples/experimental/runtimeconfig/multipleIOResolutions.xml
rename to examples/experimental/runtimeconfig/configs/multipleIOResolutions.xml
diff --git a/examples/experimental/runtimeconfig/multipleTransformedVariables.xml b/examples/experimental/runtimeconfig/configs/multipleTransformedVariables.xml
similarity index 100%
rename from examples/experimental/runtimeconfig/multipleTransformedVariables.xml
rename to examples/experimental/runtimeconfig/configs/multipleTransformedVariables.xml
diff --git a/examples/experimental/runtimeconfig/hello/CMakeLists.txt b/examples/experimental/runtimeconfig/hello/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..794404e46d634a5c278741d97930b8f4b379cabc
--- /dev/null
+++ b/examples/experimental/runtimeconfig/hello/CMakeLists.txt
@@ -0,0 +1,11 @@
+if(ADIOS2_HAVE_MPI)
+  find_package(MPI COMPONENTS C REQUIRED)
+
+  add_executable(helloBPWriterXML helloBPWriterXML.cpp)
+  target_include_directories(helloBPWriterXML PRIVATE ${MPI_C_INCLUDE_PATH})
+  target_link_libraries(helloBPWriterXML ${MPI_C_LIBRARIES})
+else()
+  add_executable(helloBPWriterXML helloBPWriterXML_nompi.cpp)
+endif()
+
+target_link_libraries(helloBPWriterXML adios2)