diff --git a/src/zeek-setup.cc b/src/zeek-setup.cc
index 3a66f2a350..b34a54ea12 100644
--- a/src/zeek-setup.cc
+++ b/src/zeek-setup.cc
@@ -548,6 +548,7 @@ SetupResult setup(int argc, char** argv, Options* zopts)
 	if ( ! options.bare_mode )
 		add_input_file("base/init-default.zeek");
 
+	add_input_file("builtin-plugins/__preload__.zeek");
 	add_input_file("builtin-plugins/__load__.zeek");
 
 	plugin_mgr->SearchDynamicPlugins(util::zeek_plugin_path());
diff --git a/zeek-path-dev.in b/zeek-path-dev.in
index fe70f6a4a1..bea0f21145 100755
--- a/zeek-path-dev.in
+++ b/zeek-path-dev.in
@@ -10,4 +10,4 @@
 #     ZEEKPATH=`./zeek-path-dev` ./src/zeek
 #
 
-echo .:${CMAKE_SOURCE_DIR}/scripts:${CMAKE_SOURCE_DIR}/scripts/policy:${CMAKE_SOURCE_DIR}/scripts/site:${CMAKE_BINARY_DIR}/scripts
+echo .:${CMAKE_SOURCE_DIR}/scripts:${CMAKE_SOURCE_DIR}/scripts/policy:${CMAKE_SOURCE_DIR}/scripts/site:${CMAKE_BINARY_DIR}/scripts:${CMAKE_BINARY_DIR}/scripts/builtin-plugins