diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 546680a8d7..4d23220ab6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -107,7 +107,11 @@ set(BIF_SRCS
     strings.bif
     reporter.bif
     option.bif
-    supervisor.bif
+    # Note: the supervisor BIF file is treated like other top-level BIFs
+    # instead of contained in its own subdirectory CMake logic because
+    # subdirectory BIFs are treated differently and don't support being called
+    # *during* parsing (e.g. within an @if directive).
+    supervisor/supervisor.bif
 )
 
 foreach (bift ${BIF_SRCS})
@@ -267,7 +271,6 @@ set(MAIN_SRCS
     Notifier.cc
     Stats.cc
     Stmt.cc
-    Supervisor.cc
     Tag.cc
     Timer.cc
     Traverse.cc
@@ -288,6 +291,8 @@ set(MAIN_SRCS
     modp_numtoa.c
     siphash24.c
 
+    supervisor/Supervisor.cc
+
     threading/BasicThread.cc
     threading/Formatter.cc
     threading/Manager.cc
diff --git a/src/Net.cc b/src/Net.cc
index 8c7e976bbc..4ef0a0a54a 100644
--- a/src/Net.cc
+++ b/src/Net.cc
@@ -33,7 +33,6 @@
 #include "iosource/PktDumper.h"
 #include "plugin/Manager.h"
 #include "broker/Manager.h"
-#include "Supervisor.h"
 
 extern "C" {
 #include "setsignal.h"
diff --git a/src/main.cc b/src/main.cc
index d26cdaaa48..98661df2ea 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -46,7 +46,7 @@ extern "C" {
 #include "Brofiler.h"
 #include "Traverse.h"
 
-#include "Supervisor.h"
+#include "supervisor/Supervisor.h"
 #include "threading/Manager.h"
 #include "input/Manager.h"
 #include "logging/Manager.h"
diff --git a/src/Supervisor.cc b/src/supervisor/Supervisor.cc
similarity index 100%
rename from src/Supervisor.cc
rename to src/supervisor/Supervisor.cc
diff --git a/src/Supervisor.h b/src/supervisor/Supervisor.h
similarity index 100%
rename from src/Supervisor.h
rename to src/supervisor/Supervisor.h
diff --git a/src/supervisor.bif b/src/supervisor/supervisor.bif
similarity index 98%
rename from src/supervisor.bif
rename to src/supervisor/supervisor.bif
index 17c67d1d33..b97c562deb 100644
--- a/src/supervisor.bif
+++ b/src/supervisor/supervisor.bif
@@ -1,7 +1,7 @@
 ##! The BIFs that define the Zeek supervisor control interface.
 
 %%{
-#include "Supervisor.h"
+#include "supervisor/Supervisor.h"
 %%}
 
 module Supervisor;