diff --git a/CHANGES b/CHANGES
index ee07898969..56288489a6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,11 @@
 
+2.5-559 | 2018-05-08 11:23:28 -0700
+
+  * Add test for dump_current_packet bif. (Johanna Amann)
+
+	* Fix dump_packet & dump_current_packet to work with several filenames.
+    (Assaf Morami)
+
 2.5-553 | 2018-05-03 14:59:53 -0500
 
   * Make BinPAC exception handling more consistent (Vlad Grigorescu)
diff --git a/VERSION b/VERSION
index feba24af84..a04526640f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.5-553
+2.5-559
diff --git a/testing/btest/Baseline/bifs.dump_current_packet/1.pcap b/testing/btest/Baseline/bifs.dump_current_packet/1.pcap
new file mode 100644
index 0000000000..786971a6cf
Binary files /dev/null and b/testing/btest/Baseline/bifs.dump_current_packet/1.pcap differ
diff --git a/testing/btest/Baseline/bifs.dump_current_packet/2.pcap b/testing/btest/Baseline/bifs.dump_current_packet/2.pcap
new file mode 100644
index 0000000000..6045568b4b
Binary files /dev/null and b/testing/btest/Baseline/bifs.dump_current_packet/2.pcap differ
diff --git a/testing/btest/bifs/dump_current_packet.bro b/testing/btest/bifs/dump_current_packet.bro
new file mode 100644
index 0000000000..61c96384e4
--- /dev/null
+++ b/testing/btest/bifs/dump_current_packet.bro
@@ -0,0 +1,13 @@
+# @TEST-EXEC: bro -b -r $TRACES/wikipedia.trace %INPUT
+# @TEST-EXEC: btest-diff 1.pcap
+# @TEST-EXEC: btest-diff 2.pcap
+
+global i: count = 0;
+
+event new_packet(c: connection, p: pkt_hdr)
+	{
+	++i;
+	dump_current_packet(cat(i, ".pcap"));
+	if ( i >= 3 )
+		terminate();
+	}