diff --git a/CHANGES b/CHANGES
index e6cdadfa38..a662995f2d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,13 @@
 
+2.3-86 | 2014-07-31 14:19:58 -0700
+
+  * Fix for redefining built-in constants. (Robin Sommer)
+    
+  * Adding missing check that a plugin's API version matches what Bro
+    defines. (Robin Sommer)
+
+  * Adding NEWS entry for plugins. (Robin Sommer)
+
 2.3-83 | 2014-07-30 16:26:11 -0500
 
   * Minor adjustments to plugin code/docs. (Jon Siwek)
diff --git a/VERSION b/VERSION
index d74f8f9fef..7551c78f13 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.3-83
+2.3-86
diff --git a/src/Func.cc b/src/Func.cc
index 7d78375bad..41eac7d1df 100644
--- a/src/Func.cc
+++ b/src/Func.cc
@@ -634,11 +634,14 @@ void init_builtin_funcs()
 #include "reporter.bif.func_init"
 #include "strings.bif.func_init"
 
-#include "__all__.bif.init.cc" // Autogenerated for compiling in the bif_target() code.
-
 	did_builtin_init = true;
 	}
 
+void init_builtin_funcs_subdirs()
+{
+	#include "__all__.bif.init.cc" // Autogenerated for compiling in the bif_target() code.
+}
+
 bool check_built_in_call(BuiltinFunc* f, CallExpr* call)
 	{
 	if ( f->TheFunc() != BifFunc::bro_fmt )
diff --git a/src/Func.h b/src/Func.h
index 17d0fd9ecf..446043d581 100644
--- a/src/Func.h
+++ b/src/Func.h
@@ -134,6 +134,7 @@ protected:
 
 extern void builtin_error(const char* msg, BroObj* arg = 0);
 extern void init_builtin_funcs();
+extern void init_builtin_funcs_subdirs();
 
 extern bool check_built_in_call(BuiltinFunc* f, CallExpr* call);
 
diff --git a/src/main.cc b/src/main.cc
index cc4d0956f8..54eff8fa92 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -927,6 +927,7 @@ int main(int argc, char** argv)
 
 	init_general_global_var();
 	init_net_var();
+	init_builtin_funcs_subdirs();
 
 	plugin_mgr->InitBifs();