diff -Naur clamav-1.0.0_b/clamconf/clamconf.c clamav-1.0.0/clamconf/clamconf.c
--- clamav-1.0.0_b/clamconf/clamconf.c	2022-11-24 00:54:47.000000000 +0600
+++ clamav-1.0.0/clamconf/clamconf.c	2022-12-29 20:49:49.268068198 +0600
@@ -63,9 +63,9 @@
     const char *name;
     int tool;
 } cfgfile[] = {
-    {"clamd.conf", OPT_CLAMD},
+    {"clamd.d/clamd.conf", OPT_CLAMD},
     {"freshclam.conf", OPT_FRESHCLAM},
-    {"clamav-milter.conf", OPT_MILTER},
+    {"mail/clamav-milter.conf", OPT_MILTER},
     {NULL, 0}};
 
 static void printopts(struct optstruct *opts, int nondef)
diff -Naur clamav-1.0.0_b/docs/man/clamav-milter.8.in clamav-1.0.0/docs/man/clamav-milter.8.in
--- clamav-1.0.0_b/docs/man/clamav-milter.8.in	2022-11-24 00:54:48.000000000 +0600
+++ clamav-1.0.0/docs/man/clamav-milter.8.in	2022-12-29 20:47:07.244028226 +0600
@@ -27,7 +27,7 @@
 Read configuration from FILE.
 .SH "FILES"
 .LP
-@CONFDIR@/clamav-milter.conf
+@CONFDIR@/mail/clamav-milter.conf
 .SH "AUTHOR"
 .LP
 aCaB <acab@clamav.net>
diff -Naur clamav-1.0.0_b/docs/man/clamd.8.in clamav-1.0.0/docs/man/clamd.8.in
--- clamav-1.0.0_b/docs/man/clamd.8.in	2022-11-24 00:54:48.000000000 +0600
+++ clamav-1.0.0/docs/man/clamd.8.in	2022-12-29 20:48:39.492481634 +0600
@@ -7,7 +7,7 @@
 clamd [options]
 .SH "DESCRIPTION"
 .LP
-The daemon listens for incoming connections on Unix and/or TCP socket and scans files or directories on demand. It reads the configuration from @CONFDIR@/clamd.conf
+The daemon listens for incoming connections on Unix and/or TCP socket and scans files or directories on demand. It reads the configuration from @CONFDIR@/clam.d/clamd.conf
 .SH "COMMANDS"
 .LP
 It's recommended to prefix clamd commands with the letter \fBz\fR (eg. zSCAN) to indicate that the command will be delimited by a NULL character and that clamd should continue reading command data until a NULL character is read. The null delimiter assures that the complete command and its entire argument will be processed as a single command. Alternatively commands may be prefixed with the letter \fBn\fR (e.g. nSCAN) to use a newline character as the delimiter. Clamd replies will honour the requested terminator in turn.
@@ -133,7 +133,7 @@
 Perform a clean exit.
 .SH "FILES"
 .LP
-@CONFDIR@/clamd.conf
+@CONFDIR@/clam.d/clamd.conf
 .SH "CREDITS"
 Please check the full documentation for credits.
 .SH "AUTHOR"
diff -Naur clamav-1.0.0_b/platform.h.in clamav-1.0.0/platform.h.in
--- clamav-1.0.0_b/platform.h.in	2022-11-24 00:54:48.000000000 +0600
+++ clamav-1.0.0/platform.h.in	2022-12-29 20:46:43.996165974 +0600
@@ -112,9 +112,9 @@
 #endif
 
 #ifndef _WIN32
-#define CONFDIR_CLAMD CONFDIR PATHSEP "clamd.conf"
+#define CONFDIR_CLAMD CONFDIR PATHSEP "clam.d/clamd.conf"
 #define CONFDIR_FRESHCLAM CONFDIR PATHSEP "freshclam.conf"
-#define CONFDIR_MILTER CONFDIR PATHSEP "clamav-milter.conf"
+#define CONFDIR_MILTER CONFDIR PATHSEP "mail/clamav-milter.conf"
 #endif
 
 #ifndef WORDS_BIGENDIAN