diff --git a/CMLibFormatSources.cmake b/CMLibFormatSources.cmake
index 2c25b81..0a80e14 100644
--- a/CMLibFormatSources.cmake
+++ b/CMLibFormatSources.cmake
@@ -4,30 +4,28 @@ function(add_format_sources target)
   if(NOT TARGET format-sources)
     add_custom_target(format-sources)
   endif()
+  if(NOT TARGET doc-add-comments)
+    add_custom_target(doc-add-comments)
+  endif()
 
   find_program(UNCRUSTIFY_EXE NAMES uncrustify)
   if(UNCRUSTIFY_EXE)
-    list(
-      APPEND
-      UNCRUSTIFY_OPTS
-      -lCPP
-      --replace
-      --no-backup)
-    if(EXISTS ${CMAKE_SOURCE_DIR}/cmake/etc/uncrustify/comments.cfg)
-      if(NOT TARGET doc-add-comments)
-        add_custom_target(doc-add-comments)
-      endif()
-      set(COMMENTS_OPTS ${UNCRUSTIFY_OPTS} -c ${CMAKE_SOURCE_DIR}/cmake/etc/uncrustify/comments.cfg)
-      add_custom_target(doc-add-comments-uncrustify-${target} COMMAND ${UNCRUSTIFY_EXE} ${COMMENTS_OPTS}
-                                                                      ${_sources})
-      add_dependencies(doc-add-comments doc-add-comments-uncrustify-${target})
-    endif()
+    list(APPEND UNCRUSTIFY_OPTS -lCPP --replace --no-backup)
     if(EXISTS ${CMAKE_SOURCE_DIR}/cmake/etc/uncrustify/default.cfg)
-      list(APPEND UNCRUSTIFY_OPTS --mtime -c ${CMAKE_SOURCE_DIR}/cmake/etc/uncrustify/default.cfg)
+      list(APPEND UNCRUSTIFY_OPTS -c ${CMAKE_SOURCE_DIR}/cmake/etc/uncrustify/default.cfg)
     endif()
+    # cmake-format: off
     add_custom_target(format-sources-uncrustify-${target} COMMAND ${UNCRUSTIFY_EXE} ${UNCRUSTIFY_OPTS}
-                                                                  ${_sources})
+      --mtime ${_sources})
+    add_custom_target(doc-add-comments-uncrustify-${target} COMMAND ${UNCRUSTIFY_EXE} ${UNCRUSTIFY_OPTS}
+      --set cmt_insert_file_header=fileheader.txt
+      --set cmt_insert_file_footer=filefooter.txt
+      --set cmt_insert_func_header=funcheader.txt
+      --set cmt_insert_class_header=classheader.txt
+      --set cmt_insert_before_ctor_dtor=true ${_sources})
+    # cmake-format: on
     add_dependencies(format-sources format-sources-uncrustify-${target})
+    add_dependencies(doc-add-comments doc-add-comments-uncrustify-${target})
   else()
     message(STATUS "CMLIB warning:")
     message(STATUS "  uncrustify executable is not found")