diff --git a/CHANGES b/CHANGES
index 85de307c2a..b59145a138 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,18 @@
 
+2.3-196 | 2014-09-25 17:53:27 -0700
+
+  * Changing prefix for packet sources/dumper from ':' to '%'.
+    Addresses BIT-1249. (Robin Sommer)
+
+  * Remove timeouts from remote communication loop. The select() now
+    blocks until there's work to do instead of relying on a small
+    timeout value which can cause unproductive use of cpu cycles. (Jon
+    Siwek)
+
+  * Improve error message when failing to activate a plugin. Also fix
+    a unit test helper script that checks plugin availability. (Jon
+    Siwek)
+
 2.3-183 | 2014-09-24 10:08:04 -0500
 
   * Add a "node" field to Intel::Seen struture and intel.log to
diff --git a/VERSION b/VERSION
index 5e605d2618..9301ded595 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.3-183
+2.3-196
diff --git a/aux/binpac b/aux/binpac
index 30c156d879..3a4684801a 160000
--- a/aux/binpac
+++ b/aux/binpac
@@ -1 +1 @@
-Subproject commit 30c156d879f6303f15ebf8e59989d8a42d882bdf
+Subproject commit 3a4684801aafa0558383199e9abd711650b53af9
diff --git a/aux/bro-aux b/aux/bro-aux
index 30e6ff1a07..95afe42e74 160000
--- a/aux/bro-aux
+++ b/aux/bro-aux
@@ -1 +1 @@
-Subproject commit 30e6ff1a0735f56c015cf979bc1feda38ff00dbf
+Subproject commit 95afe42e7474113a16cb2cb09ebdf8b552c59744
diff --git a/aux/broccoli b/aux/broccoli
index 07cfcc76fb..33d0ed4a54 160000
--- a/aux/broccoli
+++ b/aux/broccoli
@@ -1 +1 @@
-Subproject commit 07cfcc76fb08365b545bd3f412c3f6e6c92824e9
+Subproject commit 33d0ed4a54a6ecf08a0b5fe18831aa413b437066
diff --git a/aux/broctl b/aux/broctl
index 2606a95c9d..2f808bc854 160000
--- a/aux/broctl
+++ b/aux/broctl
@@ -1 +1 @@
-Subproject commit 2606a95c9dcbc83bd863c2981ce7189e5d58697b
+Subproject commit 2f808bc8541378b1a4953cca02c58c43945d154f
diff --git a/cmake b/cmake
index f2e8ba6b90..03de0cc467 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit f2e8ba6b90b3a2da9f1f77c55d0e718c25376bbb
+Subproject commit 03de0cc467d2334dcb851eddd843d59fef217909
diff --git a/src/iosource/Component.cc b/src/iosource/Component.cc
index a285cd8552..1e4f029400 100644
--- a/src/iosource/Component.cc
+++ b/src/iosource/Component.cc
@@ -24,7 +24,7 @@ Component::~Component()
 PktSrcComponent::PktSrcComponent(const std::string& arg_name, const std::string& arg_prefix, InputType arg_type, factory_callback arg_factory)
 	: iosource::Component(plugin::component::PKTSRC, arg_name)
 	{
-	tokenize_string(arg_prefix, ":", &prefixes);
+	tokenize_string(arg_prefix, "%", &prefixes);
 	type = arg_type;
 	factory = arg_factory;
 	}
@@ -110,7 +110,7 @@ void PktSrcComponent::DoDescribe(ODesc* d) const
 PktDumperComponent::PktDumperComponent(const std::string& name, const std::string& arg_prefix, factory_callback arg_factory)
 	: plugin::Component(plugin::component::PKTDUMPER, name)
 	{
-	tokenize_string(arg_prefix, ":", &prefixes);
+	tokenize_string(arg_prefix, "%", &prefixes);
 	factory = arg_factory;
 	}
 
diff --git a/src/iosource/Manager.cc b/src/iosource/Manager.cc
index 41118bdbfe..26a48c2911 100644
--- a/src/iosource/Manager.cc
+++ b/src/iosource/Manager.cc
@@ -201,7 +201,7 @@ static std::pair<std::string, std::string> split_prefix(std::string path)
 	// PktSrc to use. If not, choose default.
 	std::string prefix;
 
-	std::string::size_type i = path.find(":");
+	std::string::size_type i = path.find("%");
 	if ( i != std::string::npos )
 		{
 		prefix = path.substr(0, i);
diff --git a/testing/btest/plugins/pktdumper.bro b/testing/btest/plugins/pktdumper.bro
index 61540897d8..64eda98cdd 100644
--- a/testing/btest/plugins/pktdumper.bro
+++ b/testing/btest/plugins/pktdumper.bro
@@ -3,6 +3,6 @@
 # @TEST-EXEC: ./configure --bro-dist=${DIST} && make
 # @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` bro -NN Demo::Foo  >>output
 # @TEST-EXEC: echo === >>output
-# @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` bro -r $TRACES/port4242.trace -w foo:XXX %INPUT FilteredTraceDetection::enable=F >>output
+# @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` bro -r $TRACES/port4242.trace -w foo/XXX %INPUT FilteredTraceDetection::enable=F >>output
 # @TEST-EXEC: btest-diff output
 
diff --git a/testing/btest/plugins/pktsrc.bro b/testing/btest/plugins/pktsrc.bro
index 39d2fa9aff..87f23d9f75 100644
--- a/testing/btest/plugins/pktsrc.bro
+++ b/testing/btest/plugins/pktsrc.bro
@@ -3,6 +3,6 @@
 # @TEST-EXEC: ./configure --bro-dist=${DIST} && make
 # @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` bro -NN Demo::Foo  >>output
 # @TEST-EXEC: echo === >>output
-# @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` bro -r foo:XXX %INPUT FilteredTraceDetection::enable=F >>output
+# @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` bro -r foo/XXX %INPUT FilteredTraceDetection::enable=F >>output
 # @TEST-EXEC: btest-diff conn.log