diff --git a/CMake/FLTKConfig.cmake.in b/CMake/FLTKConfig.cmake.in
index 404b08835..2fafb4b7a 100644
--- a/CMake/FLTKConfig.cmake.in
+++ b/CMake/FLTKConfig.cmake.in
@@ -1,6 +1,4 @@
 #
-# "$Id$"
-#
 # FLTKConfig.cmake - FLTK CMake configuration file for external projects.
 #
 # This file is generated by CMake and used to load FLTK's settings for
@@ -13,31 +11,32 @@
 #  FLTK_FLUID_EXECUTABLE - needed by the function FLTK_RUN_FLUID
 #                          (or the deprecated fltk_wrap_ui() CMake command)
 #
-#  FLTK_USE_FILE - sets things up to use FLTK (deprecated since FLTK 1.3.4)
-#                - will be removed in FLTK 1.4.0
+#  FLTK_USE_FILE - previously used to set things up to use FLTK
+#                - deprecated since FLTK 1.3.4
+#                - will be removed in FLTK 1.4.0 or later
 
-set(FLTK_VERSION @FLTK_VERSION_FULL@)
+set (FLTK_VERSION @FLTK_VERSION_FULL@)
 
-include(${CMAKE_CURRENT_LIST_DIR}/FLTK-Targets.cmake)
+include (${CMAKE_CURRENT_LIST_DIR}/FLTK-Targets.cmake)
 
-set(FLTK_INCLUDE_DIRS "@INCLUDE_DIRS@")
-set(FLTK_USE_FILE ${CMAKE_CURRENT_LIST_DIR}/UseFLTK.cmake)
+set (FLTK_INCLUDE_DIRS "@INCLUDE_DIRS@")
+set (FLTK_USE_FILE ${CMAKE_CURRENT_LIST_DIR}/UseFLTK.cmake)
 
-if(CMAKE_CROSSCOMPILING)
-   find_file(FLUID_PATH
-      NAMES fluid fluid.exe
-      PATHS ENV PATH
-      NO_CMAKE_FIND_ROOT_PATH
-   )
-   add_executable(fluid IMPORTED)
-   set_target_properties(fluid
-      PROPERTIES IMPORTED_LOCATION ${FLUID_PATH}
-   )
-   set(FLTK_FLUID_EXECUTABLE ${FLUID_PATH})
-else()
-   set(FLTK_FLUID_EXECUTABLE fluid)
-endif(CMAKE_CROSSCOMPILING)
+if (CMAKE_CROSSCOMPILING)
+  find_file(FLUID_PATH
+    NAMES fluid fluid.exe
+    PATHS ENV PATH
+    NO_CMAKE_FIND_ROOT_PATH
+  )
+  add_executable(fluid IMPORTED)
+  set_target_properties(fluid
+    PROPERTIES IMPORTED_LOCATION ${FLUID_PATH}
+  )
+  set (FLTK_FLUID_EXECUTABLE ${FLUID_PATH})
+else ()
+  set (FLTK_FLUID_EXECUTABLE fluid)
+endif (CMAKE_CROSSCOMPILING)
 
 #
-# End of "$Id$".
+# End of file
 #
diff --git a/CMake/UseFLTK.cmake.in b/CMake/UseFLTK.cmake.in
index 160b049c5..20ecb85d6 100644
--- a/CMake/UseFLTK.cmake.in
+++ b/CMake/UseFLTK.cmake.in
@@ -1,20 +1,19 @@
 #
-# "$Id$"
-#
 # UseFLTK.CMake - FLTK CMake environment configuration file for external projects.
 #
-# This file is deprecated and will be removed in FLTK 1.4
+# This file is deprecated and will be removed in FLTK 1.4.0 or later
 #
 # automatically generated - do not edit
 #
 
-include_directories("@INCLUDE_DIRS@")
+include_directories("@FLTK_INCLUDE_DIRS@")
 
-message(STATUS "* Notice: UseFLTK.CMake is deprecated and will be removed in FLTK 1.4")
-message(STATUS "*   Please use 'include_directories(\${FLTK_INCLUDE_DIRS})' or")
-message(STATUS "*   'target_include_directories(<target> PUBLIC|PRIVATE \${FLTK_INCLUDE_DIRS})'")
-message(STATUS "*   instead of 'include(\${FLTK_USE_FILE})'.")
+message(AUTHOR_WARNING
+" * Warning: UseFLTK.cmake is deprecated and will be removed in FLTK 1.4.0
+ * or later. Please use 'include_directories(\${FLTK_INCLUDE_DIRS})' or
+ * 'target_include_directories(<target> PUBLIC|PRIVATE \${FLTK_INCLUDE_DIRS})'
+ * instead of 'include(\${FLTK_USE_FILE})'.")
 
 #
-# End of "$Id$".
+# End of file
 #