diff --git a/CHANGES b/CHANGES
index 3109d4670e..4dafe93f43 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,9 @@
 
+2.3-278 | 2014-11-03 18:55:18 -0800
+
+  * Add new curves from draft-ietf-tls-negotiated-ff-dhe to SSL
+    analysis. (Johanna Amann)
+
 2.3-274 | 2014-10-31 17:45:25 -0700
 
   * Adding call to new binpac::init() function. (Robin Sommer)
diff --git a/VERSION b/VERSION
index a11a6bac50..5dd2c9f17c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.3-274
+2.3-278
diff --git a/aux/binpac b/aux/binpac
index 7f440d060e..77a86591dc 160000
--- a/aux/binpac
+++ b/aux/binpac
@@ -1 +1 @@
-Subproject commit 7f440d060e0df675c1aab3357ff7b93fcf1c2cae
+Subproject commit 77a86591dcf89d7252d3676d3f1199d6c927d073
diff --git a/aux/bro-aux b/aux/bro-aux
index 95afe42e74..977654dc51 160000
--- a/aux/bro-aux
+++ b/aux/bro-aux
@@ -1 +1 @@
-Subproject commit 95afe42e7474113a16cb2cb09ebdf8b552c59744
+Subproject commit 977654dc51ab08a2afde32241f108cdb4a581d8f
diff --git a/aux/broccoli b/aux/broccoli
index 33d0ed4a54..acb8fbe8e7 160000
--- a/aux/broccoli
+++ b/aux/broccoli
@@ -1 +1 @@
-Subproject commit 33d0ed4a54a6ecf08a0b5fe18831aa413b437066
+Subproject commit acb8fbe8e7bc6ace5135fb73dca8e29432cdc1ca
diff --git a/aux/broctl b/aux/broctl
index 2f808bc854..39e865dec9 160000
--- a/aux/broctl
+++ b/aux/broctl
@@ -1 +1 @@
-Subproject commit 2f808bc8541378b1a4953cca02c58c43945d154f
+Subproject commit 39e865dec9611b9b53b609cbc8df519cebae0a1e
diff --git a/cmake b/cmake
index 03de0cc467..1316c07f70 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 03de0cc467d2334dcb851eddd843d59fef217909
+Subproject commit 1316c07f7059647b6c4a496ea36e4b83bb5d8f0f
diff --git a/scripts/base/protocols/ssl/consts.bro b/scripts/base/protocols/ssl/consts.bro
index 54952988f0..278a2a37ae 100644
--- a/scripts/base/protocols/ssl/consts.bro
+++ b/scripts/base/protocols/ssl/consts.bro
@@ -158,6 +158,12 @@ export {
 		[26] = "brainpoolP256r1",
 		[27] = "brainpoolP384r1",
 		[28] = "brainpoolP512r1",
+		# draft-ietf-tls-negotiated-ff-dhe-02
+		[256] = "ffdhe2432",
+		[257] = "ffdhe3072",
+		[258] = "ffdhe4096",
+		[259] = "ffdhe6144",
+		[260] = "ffdhe8192",
 		[0xFF01] = "arbitrary_explicit_prime_curves",
 		[0xFF02] = "arbitrary_explicit_char2_curves"
 	} &default=function(i: count):string { return fmt("unknown-%d", i); };