diff --git a/CHANGES b/CHANGES
index d24cdb31a8..ba04905de6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,10 @@
 
+4.1.0-dev.426 | 2021-03-26 17:17:45 -0700
+
+  * GH-1463: Rename supervisor_rotation_format_func to archiver_rotation_format_func (Vlad Grigorescu)
+
+    And expose it for non-supervised setups.  Also deprecates the old name.
+
 4.1.0-dev.423 | 2021-03-26 16:44:26 -0700
 
   * GH-1454: Heartbleed: fix substraction order. (Johanna Amann)
diff --git a/NEWS b/NEWS
index 820639d06c..410302b161 100644
--- a/NEWS
+++ b/NEWS
@@ -74,6 +74,8 @@ Deprecated Functionality
   environment variables prefixed by ``BRO_`` is now removed and calling
   ``getenv()`` directly with ``ZEEK_`` environment variables can be done.
 
+- ``supervisor_rotation_format_func`` is renamed to ``archiver_rotation_format_func``
+
 Zeek 4.0.0
 ==========
 
diff --git a/VERSION b/VERSION
index e7c3730eaf..b335514ae2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.1.0-dev.423
+4.1.0-dev.426
diff --git a/scripts/base/frameworks/cluster/nodes/logger.zeek b/scripts/base/frameworks/cluster/nodes/logger.zeek
index 772d512658..9d0d4121c8 100644
--- a/scripts/base/frameworks/cluster/nodes/logger.zeek
+++ b/scripts/base/frameworks/cluster/nodes/logger.zeek
@@ -22,11 +22,10 @@ redef Log::default_rotation_interval = 1 hrs;
 ## Alarm summary mail interval.
 redef Log::default_mail_alarms_interval = 24 hrs;
 
-@if ( Supervisor::is_supervised() )
-
-redef Log::default_rotation_dir = "log-queue";
-
-function supervisor_rotation_format_func(ri: Log::RotationFmtInfo): Log::RotationPath
+## This function will rotate logs in a format compatible with zeek-archiver.
+## If you're using the Supervisor framework, this function will be used,
+## if not, you can set :zeek:see:`Log::rotation_format_func` to this function.
+function archiver_rotation_format_func(ri: Log::RotationFmtInfo): Log::RotationPath
 	{
 	local open_str = strftime(Log::default_rotation_date_format, ri$open);
 	local close_str = strftime(Log::default_rotation_date_format, ri$close);
@@ -35,7 +34,13 @@ function supervisor_rotation_format_func(ri: Log::RotationFmtInfo): Log::Rotatio
 	return rval;
 	}
 
-redef Log::rotation_format_func = supervisor_rotation_format_func;
+@if ( Supervisor::is_supervised() )
+
+global supervisor_rotation_format_func = archiver_rotation_format_func &deprecated="Remove in v5.1.  Use 'archiver_rotation_format_func'.";
+
+redef Log::default_rotation_dir = "log-queue";
+
+redef Log::rotation_format_func = archiver_rotation_format_func;
 
 redef LogAscii::enable_leftover_log_rotation = T;