diff --git a/CHANGES b/CHANGES
index 1c23429a43..75d3356603 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,15 @@
 
+2.1-731 | 2013-06-04 21:19:08 -0700
+
+  * Reorginization of internal protocol analyzer code. We're moving
+    them to a modularized structure, based on a plugin model. Along
+    with this change comes generic plugin infrastructure that we'll
+    later extend to other Bro component as well. For now all plugins
+    are compiled in statically, but in the future we plan to also
+    enable dynamic loading at run time. (Robin Sommer)
+
+  * Ignoring file ids in external tests. (Robin Sommer)
+
 2.1-675 | 2013-06-02 20:03:19 -0700
 
   * Fix a compiler warning. (Robin Sommer)
diff --git a/VERSION b/VERSION
index f3667fe959..d138533403 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.1-675
+2.1-731
diff --git a/testing/scripts/diff-canonifier-external b/testing/scripts/diff-canonifier-external
index 04ef699538..f4356154e4 100755
--- a/testing/scripts/diff-canonifier-external
+++ b/testing/scripts/diff-canonifier-external
@@ -4,6 +4,7 @@
 
 `dirname $0`/diff-remove-timestamps \
     | `dirname $0`/diff-remove-uids \
+    | `dirname $0`/diff-remove-file-ids \
     | `dirname $0`/diff-remove-x509-names \
     | `dirname $0`/diff-canon-notice-policy \
     | `dirname $0`/diff-sort
diff --git a/testing/scripts/diff-remove-file-ids b/testing/scripts/diff-remove-file-ids
new file mode 100755
index 0000000000..f54177d8ba
--- /dev/null
+++ b/testing/scripts/diff-remove-file-ids
@@ -0,0 +1,33 @@
+#! /usr/bin/awk -f
+#
+# A diff canonifier that removes all file IDs from file_analysis.log
+
+BEGIN {
+    FS="\t";
+    OFS="\t";
+    process = 0;
+    }
+
+$1 == "#path" && $2 == "file_analysis" {
+    process = 1;
+    }
+
+process && column1 > 0 && column2 > 0 {
+    $column1 = "XXXXXXXXXXX";
+    $column2 = "XXXXXXXXXXX";
+    }
+
+/^#/ {
+    for ( i = 0; i < NF; ++i ) {
+        if ( $i == "id" )
+            column1 = i - 1;
+
+        if ( $i == "parent_id" )
+            column2 = i - 1;
+        }
+    }
+
+{ print }
+
+
+