diff --git a/cmake b/cmake
index 94e72a3075..0187b33a29 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 94e72a3075bb0b9550ad05758963afda394bfb2c
+Subproject commit 0187b33a29d5ec824f940feff60dc5d8c2fe314f
diff --git a/src/main.cc b/src/main.cc
index 79c895e7af..491f8a732d 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -853,8 +853,8 @@ int main(int argc, char** argv)
 
 	yyparse();
 
-	analyzer_mgr->InitPostScript();
 	plugin_mgr->InitPostScript();
+	analyzer_mgr->InitPostScript();
 
 	if ( print_plugins )
 		{
diff --git a/src/plugin/Macros.h b/src/plugin/Macros.h
index b8e2a42fdb..64f04d7645 100644
--- a/src/plugin/Macros.h
+++ b/src/plugin/Macros.h
@@ -37,7 +37,7 @@
 	namespace plugin { namespace _ns ## _ ## _name {\
 		class Plugin : public plugin::Plugin {		\
 		protected:					\
-			void Init()				\
+			void InitPreScript()				\
 			{					\
 			SetName(#_ns "::" #_name);		\
 			SetVersion(_BRO_PLUGIN_VERSION_DEFAULT);\
diff --git a/src/plugin/Manager.cc b/src/plugin/Manager.cc
index ed6b43d2c4..93ed3f2b97 100644
--- a/src/plugin/Manager.cc
+++ b/src/plugin/Manager.cc
@@ -52,8 +52,6 @@ void Manager::InitPostScript()
 
 	for ( plugin_list::iterator i = Manager::PluginsInternal()->begin(); i != Manager::PluginsInternal()->end(); i++ )
 		(*i)->InitPostScript();
-
-	init = true;
 	}
 
 void Manager::FinishPlugins()