diff --git a/CHANGES b/CHANGES
index b5fb5fe274..3d7118c750 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,17 @@
 
+2.2-beta-184 | 2013-11-03 22:53:42 -0800
+
+  * Remove swig-ruby from required packages section of install doc.
+    (Daniel Thayer)
+
+2.2-beta-182 | 2013-11-01 05:26:05 -0700
+
+  * Adding source and original copyright statement to Mozilla cert
+    list. (Robin Sommer)
+
+  * Canonfying an intel test to not depend on output order. (Robin
+    Sommer)
+
 2.2-beta-177 | 2013-10-30 04:54:54 -0700
 
   * Fix thread processing/termination conditions. (Jon Siwek)
diff --git a/VERSION b/VERSION
index 9a2bcb901d..24723a69bb 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.2-beta-177
+2.2-beta-184
diff --git a/aux/bro-aux b/aux/bro-aux
index d17f99107c..ce8a9733c4 160000
--- a/aux/bro-aux
+++ b/aux/bro-aux
@@ -1 +1 @@
-Subproject commit d17f99107cc778627a0829f0ae416073bb1e20bb
+Subproject commit ce8a9733c4f8c4c8e8b2e9e440acfcf985f39cd8
diff --git a/aux/broccoli b/aux/broccoli
index 5cc63348a4..02e5c1e1f9 160000
--- a/aux/broccoli
+++ b/aux/broccoli
@@ -1 +1 @@
-Subproject commit 5cc63348a4c3e54adaf59e5a85bec055025c6c1f
+Subproject commit 02e5c1e1f993ef0fea3e2a59c34df9f40839e398
diff --git a/aux/broctl b/aux/broctl
index cea34f6de7..aeb8501a50 160000
--- a/aux/broctl
+++ b/aux/broctl
@@ -1 +1 @@
-Subproject commit cea34f6de7fc3b6f01921593797e5f0f197b67a7
+Subproject commit aeb8501a50dcf33c53e7fe776b6e333327c11861
diff --git a/doc/install/install.rst b/doc/install/install.rst
index 5e6b742ae1..7532a82cea 100644
--- a/doc/install/install.rst
+++ b/doc/install/install.rst
@@ -85,7 +85,7 @@ that ``bash`` and ``python`` are in your ``PATH``):
   preferred Mac OS X package management system (e.g. MacPorts_, Fink_,
   or Homebrew_).
 
-  Specifically for MacPorts, the ``cmake``, ``swig``, ``swig-ruby``,
+  Specifically for MacPorts, the ``cmake``, ``swig``,
   ``swig-python`` and ``file`` packages provide the required dependencies.
 
 
diff --git a/scripts/base/protocols/ssl/mozilla-ca-list.bro b/scripts/base/protocols/ssl/mozilla-ca-list.bro
index 75dc057a55..d7c5578166 100644
--- a/scripts/base/protocols/ssl/mozilla-ca-list.bro
+++ b/scripts/base/protocols/ssl/mozilla-ca-list.bro
@@ -1,5 +1,13 @@
 # Don't edit!  This file is automatically generated.
-# Generated at: Thu Sep 19 12:40:13 -0700 2013
+# Generated at: 2013-11-01 05:23:08 -0700
+# Generated from: http://mxr.mozilla.org/mozilla-central/source/security/nss/lib/ckfw/builtins/certdata.txt?raw=1
+#
+# The original source file comes with this licensing statement:
+#
+#   This Source Code Form is subject to the terms of the Mozilla Public
+#   License, v. 2.0. If a copy of the MPL was not distributed with this
+#   file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 @load base/protocols/ssl
 module SSL;
 redef root_certs += {
diff --git a/testing/btest/scripts/base/frameworks/intel/cluster-transparency.bro b/testing/btest/scripts/base/frameworks/intel/cluster-transparency.bro
index 4d977d475d..5bedf752d2 100644
--- a/testing/btest/scripts/base/frameworks/intel/cluster-transparency.bro
+++ b/testing/btest/scripts/base/frameworks/intel/cluster-transparency.bro
@@ -4,10 +4,10 @@
 # @TEST-EXEC: btest-bg-run worker-1  BROPATH=$BROPATH:.. CLUSTER_NODE=worker-1 bro %INPUT
 # @TEST-EXEC: btest-bg-run worker-2  BROPATH=$BROPATH:.. CLUSTER_NODE=worker-2 bro %INPUT
 # @TEST-EXEC: btest-bg-wait -k 10
-# @TEST-EXEC: btest-diff manager-1/.stdout
+# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff manager-1/.stdout
+# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff worker-1/.stdout
+# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff worker-2/.stdout
 # @TEST-EXEC: btest-diff manager-1/intel.log
-# @TEST-EXEC: btest-diff worker-1/.stdout
-# @TEST-EXEC: btest-diff worker-2/.stdout
 
 @TEST-START-FILE cluster-layout.bro
 redef Cluster::nodes = {
@@ -77,4 +77,4 @@ event remote_connection_closed(p: event_peer)
 	# Cascading termination
 	#print fmt("disconnected from: %s", p);
 	terminate_communication();
-	}
\ No newline at end of file
+	}