diff --git a/meson.build b/meson.build
index 15bb9c59e3..dedc52f58d 100644
--- a/meson.build
+++ b/meson.build
@@ -1714,6 +1714,7 @@ subdir('src/udev')
 subdir('src/network')
 
 subdir('src/analyze')
+subdir('src/cryptenroll')
 subdir('src/cryptsetup')
 subdir('src/journal-remote')
 subdir('src/coredump')
@@ -2361,34 +2362,6 @@ if conf.get('HAVE_LIBCRYPTSETUP') == 1
                 install : true,
                 install_dir : systemgeneratordir)
 
-        systemd_cryptenroll_sources = files('''
-                src/cryptenroll/cryptenroll-fido2.h
-                src/cryptenroll/cryptenroll-list.c
-                src/cryptenroll/cryptenroll-list.h
-                src/cryptenroll/cryptenroll-password.c
-                src/cryptenroll/cryptenroll-password.h
-                src/cryptenroll/cryptenroll-pkcs11.h
-                src/cryptenroll/cryptenroll-recovery.c
-                src/cryptenroll/cryptenroll-recovery.h
-                src/cryptenroll/cryptenroll-tpm2.h
-                src/cryptenroll/cryptenroll-wipe.c
-                src/cryptenroll/cryptenroll-wipe.h
-                src/cryptenroll/cryptenroll.c
-                src/cryptenroll/cryptenroll.h
-'''.split())
-
-        if conf.get('HAVE_P11KIT') == 1 and conf.get('HAVE_OPENSSL') == 1
-                systemd_cryptenroll_sources += files('src/cryptenroll/cryptenroll-pkcs11.c')
-        endif
-
-        if conf.get('HAVE_LIBFIDO2') == 1
-                systemd_cryptenroll_sources += files('src/cryptenroll/cryptenroll-fido2.c')
-        endif
-
-        if conf.get('HAVE_TPM2') == 1
-                systemd_cryptenroll_sources += files('src/cryptenroll/cryptenroll-tpm2.c')
-        endif
-
         executable(
                 'systemd-cryptenroll',
                 systemd_cryptenroll_sources,
diff --git a/src/cryptenroll/meson.build b/src/cryptenroll/meson.build
new file mode 100644
index 0000000000..0a795934e2
--- /dev/null
+++ b/src/cryptenroll/meson.build
@@ -0,0 +1,28 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+systemd_cryptenroll_sources = files(
+        'cryptenroll-fido2.h',
+        'cryptenroll-list.c',
+        'cryptenroll-list.h',
+        'cryptenroll-password.c',
+        'cryptenroll-password.h',
+        'cryptenroll-pkcs11.h',
+        'cryptenroll-recovery.c',
+        'cryptenroll-recovery.h',
+        'cryptenroll-tpm2.h',
+        'cryptenroll-wipe.c',
+        'cryptenroll-wipe.h',
+        'cryptenroll.c',
+        'cryptenroll.h')
+
+if conf.get('HAVE_P11KIT') == 1 and conf.get('HAVE_OPENSSL') == 1
+        systemd_cryptenroll_sources += files('cryptenroll-pkcs11.c')
+endif
+
+if conf.get('HAVE_LIBFIDO2') == 1
+        systemd_cryptenroll_sources += files('cryptenroll-fido2.c')
+endif
+
+if conf.get('HAVE_TPM2') == 1
+        systemd_cryptenroll_sources += files('cryptenroll-tpm2.c')
+endif