3 files changed, 15 insertions, 0 deletions
diff --git a/src/src/macro_predef.c b/src/src/macro_predef.c
index 1073e45a6..0a22eec2f 100644
--- a/src/src/macro_predef.c
+++ b/src/src/macro_predef.c
@@ -284,6 +284,7 @@ options_main();
 options_routers();
 options_transports();
 options_auths();
+options_logging();
 }
 
 static void
diff --git a/src/src/macro_predef.h b/src/src/macro_predef.h
index 50b61a897..7eeaa9692 100644
--- a/src/src/macro_predef.h
+++ b/src/src/macro_predef.h
@@ -18,5 +18,6 @@ extern void options_main(void);
 extern void options_routers(void);
 extern void options_transports(void);
 extern void options_auths(void);
+extern void options_logging(void);
 extern void params_dkim(void);
 
diff --git a/src/src/readconf.c b/src/src/readconf.c
index bf024efc9..875e03222 100644
--- a/src/src/readconf.c
+++ b/src/src/readconf.c
@@ -409,6 +409,19 @@ for (ai = auths_available; ai->driver_name[0]; ai++)
   }
 }
 
+void
+options_logging(void)
+{
+bit_table * bp;
+uschar buf[64];
+
+for (bp = log_options; bp < log_options + log_options_count; bp++)
+  {
+  spf(buf, sizeof(buf), US"_LOG_%T", bp->name);
+  builtin_macro_create(buf);
+  }
+}
+
 
 #else	/*!MACRO_PREDEF*/