diff --git a/CMakeLists.txt b/CMakeLists.txt
index b4c457b4..77c4fe23 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,63 +6,9 @@ include(cmake/setup.cmake)
 add_compile_definitions(HAVE_CMAKE_H)
 
 add_library(utils STATIC
-  utils/base64_decode_atom.c
-  utils/base64_encode_atom.c
-  utils/bufchain.c
-  utils/buildinfo.c
-  utils/burnstr.c
-  utils/chomp.c
-  utils/conf.c
-  utils/conf_dest.c
-  utils/conf_launchable.c
-  utils/ctrlparse.c
-  utils/debug.c
-  utils/dupcat.c
-  utils/dupprintf.c
-  utils/dupstr.c
-  utils/encode_utf8.c
-  utils/fgetline.c
-  utils/host_strchr.c
-  utils/host_strchr_internal.c
-  utils/host_strcspn.c
-  utils/host_strduptrim.c
-  utils/host_strrchr.c
-  utils/marshal.c
-  utils/memory.c
-  utils/memxor.c
-  utils/miscucs.c
-  utils/null_lp.c
-  utils/nullseat.c
-  utils/nullstrcmp.c
-  utils/out_of_memory.c
-  utils/parse_blocksize.c
-  utils/prompts.c
-  utils/ptrlen.c
-  utils/read_file_into.c
-  utils/seat_connection_fatal.c
-  utils/sessprep.c
-  utils/sk_free_peer_info.c
-  utils/smemclr.c
-  utils/smemeq.c
-  utils/ssh2_pick_fingerprint.c
-  utils/sshutils.c
-  utils/strbuf.c
-  utils/string_length_for_printf.c
-  utils/stripctrl.c
-  utils/tree234.c
-  utils/validate_manual_hostkey.c
-  utils/version.c
-  utils/wcwidth.c
-  utils/wildcard.c
-  utils/write_c_string_literal.c
-  utils/x11authfile.c
-  utils/x11authnames.c
-  utils/x11_dehexify.c
-  utils/x11_identify_auth_proto.c
-  utils/x11_make_greeting.c
-  utils/x11_parse_ip.c
   ${GENERATED_COMMIT_C})
 add_dependencies(utils cmake_commit_c)
+add_subdirectory(utils)
 
 add_library(logging OBJECT
   logging.c)
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
new file mode 100644
index 00000000..260f9920
--- /dev/null
+++ b/utils/CMakeLists.txt
@@ -0,0 +1,56 @@
+add_sources_from_current_dir(utils
+  base64_decode_atom.c
+  base64_encode_atom.c
+  bufchain.c
+  buildinfo.c
+  burnstr.c
+  chomp.c
+  conf.c
+  conf_dest.c
+  conf_launchable.c
+  ctrlparse.c
+  debug.c
+  dupcat.c
+  dupprintf.c
+  dupstr.c
+  encode_utf8.c
+  fgetline.c
+  host_strchr.c
+  host_strchr_internal.c
+  host_strcspn.c
+  host_strduptrim.c
+  host_strrchr.c
+  marshal.c
+  memory.c
+  memxor.c
+  miscucs.c
+  null_lp.c
+  nullseat.c
+  nullstrcmp.c
+  out_of_memory.c
+  parse_blocksize.c
+  prompts.c
+  ptrlen.c
+  read_file_into.c
+  seat_connection_fatal.c
+  sessprep.c
+  sk_free_peer_info.c
+  smemclr.c
+  smemeq.c
+  ssh2_pick_fingerprint.c
+  sshutils.c
+  strbuf.c
+  string_length_for_printf.c
+  stripctrl.c
+  tree234.c
+  validate_manual_hostkey.c
+  version.c
+  wcwidth.c
+  wildcard.c
+  write_c_string_literal.c
+  x11authfile.c
+  x11authnames.c
+  x11_dehexify.c
+  x11_identify_auth_proto.c
+  x11_make_greeting.c
+  x11_parse_ip.c)