diff --git a/src/analyzer/protocol/krb/KRB.h b/src/analyzer/protocol/krb/KRB.h
index e4caf7b25c..54118b755f 100644
--- a/src/analyzer/protocol/krb/KRB.h
+++ b/src/analyzer/protocol/krb/KRB.h
@@ -18,7 +18,7 @@ public:
 	virtual void DeliverPacket(int len, const u_char* data, bool orig,
 							   uint64 seq, const IP_Hdr* ip, int caplen);
 
-	static analyzer::Analyzer* InstantiateAnalyzer(Connection* conn)
+	static analyzer::Analyzer* Instantiate(Connection* conn)
 		{ return new KRB_Analyzer(conn); }
 
 protected:
diff --git a/src/analyzer/protocol/krb/Plugin.cc b/src/analyzer/protocol/krb/Plugin.cc
index bf7d28c3f0..7485f9743f 100644
--- a/src/analyzer/protocol/krb/Plugin.cc
+++ b/src/analyzer/protocol/krb/Plugin.cc
@@ -1,10 +1,20 @@
+//See the file in the main distribution directory for copyright.
 
 #include "plugin/Plugin.h"
 #include "KRB.h"
 
-BRO_PLUGIN_BEGIN(Bro, KRB)
-	BRO_PLUGIN_DESCRIPTION("Kerberos analyzer");
-	BRO_PLUGIN_ANALYZER("KRB", krb::KRB_Analyzer);
-	BRO_PLUGIN_BIF_FILE(types);
-	BRO_PLUGIN_BIF_FILE(events);
-BRO_PLUGIN_END
+namespace plugin {
+	namespace Bro_KRB {
+		class Plugin : public plugin::Plugin {
+		public:
+			plugin::Configuration Configure()
+				{
+				AddComponent(new ::analyzer::Component("KRB", ::analyzer::krb::KRB_Analyzer::Instantiate));
+				plugin::Configuration config;
+				config.name = "Bro::KRB";
+				config.description = "Kerberos analyzer";
+				return config;
+				}
+		} plugin;
+	}
+}