diff --git a/CHANGES b/CHANGES
index cf6d4eb..c67a2b1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,28 @@
+2017-06-02 Jerry Lundström
+
+    Release 1.3.1
+
+    This release add packaging files for DEB and RPM distributions and
+    fixes a couple of bugs:
+    - ICMP code to fill the tables was wrong and created segfault using
+      normal select, aggregation or group functions. The code has been
+      rewritten to work as the DNS code does and ICMP tests have been
+      added.
+    - Historically PacketQ parses all resource records but only saves
+      the first and last record, this would overwrite EDNS information
+      if it was not the first or last record. This has been fixed by
+      saving the EDNS information as it is found.
+
+    Thanks to Anand Buddhdev (RIPE NCC) and Daniel Stirnimann (SWITCH)
+    for providing PCAPs to help resolve the bugs.
+
+    Commits:
+
+    9c2627f Fix CID 1439421
+    5423c1d Fix #17: Save EDNS information when it's found
+    ecb166e Fix #48: ICMP parsing and a little better memory handling
+    0052024 Fix #45: Add packaging files
+
 2017-05-23 Jerry Lundström
 
     Release 1.3.0
diff --git a/configure.ac b/configure.ac
index c487124..d546260 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@
 # along with PacketQ.  If not, see <http://www.gnu.org/licenses/>.
 
 AC_PREREQ(2.61)
-AC_INIT([packetq], [1.3.0], [admin@dns-oarc.net], [packetq], [https://github.com/DNS-OARC/packetq/issues])
+AC_INIT([packetq], [1.3.1], [admin@dns-oarc.net], [packetq], [https://github.com/DNS-OARC/packetq/issues])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
 AC_CONFIG_SRCDIR([src/packetq.cpp])
 AC_CONFIG_HEADER([src/config.h])
diff --git a/debian/changelog b/debian/changelog
index eb61d7e..5ae73cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,30 @@
+packetq (1.3.1-1~unstable+1) unstable; urgency=low
+
+  * Release 1.3.1
+
+    This release add packaging files for DEB and RPM distributions and
+    fixes a couple of bugs:
+    - ICMP code to fill the tables was wrong and created segfault using
+      normal select, aggregation or group functions. The code has been
+      rewritten to work as the DNS code does and ICMP tests have been
+      added.
+    - Historically PacketQ parses all resource records but only saves
+      the first and last record, this would overwrite EDNS information
+      if it was not the first or last record. This has been fixed by
+      saving the EDNS information as it is found.
+
+    Thanks to Anand Buddhdev (RIPE NCC) and Daniel Stirnimann (SWITCH)
+    for providing PCAPs to help resolve the bugs.
+
+    Commits:
+
+    9c2627f Fix CID 1439421
+    5423c1d Fix #17: Save EDNS information when it's found
+    ecb166e Fix #48: ICMP parsing and a little better memory handling
+    0052024 Fix #45: Add packaging files
+
+ -- Jerry Lundström <lundstrom.jerry@gmail.com>  Fri, 02 Jun 2017 11:07:53 +0200
+
 packetq (1.3.0-1~unstable+1) unstable; urgency=low
 
   * Release 1.3.0
diff --git a/rpm/packetq.spec b/rpm/packetq.spec
index a33828b..5e178e2 100644
--- a/rpm/packetq.spec
+++ b/rpm/packetq.spec
@@ -1,5 +1,5 @@
 Name:           packetq
-Version:        1.3.0
+Version:        1.3.1
 Release:        1%{?dist}
 Summary:        A tool that provides a basic SQL-frontend to PCAP-files
 Group:          Productivity/Networking/DNS/Utilities
@@ -54,6 +54,25 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jun 02 2017 Jerry Lundström <lundstrom.jerry@gmail.com> 1.3.1-1
+- Release 1.3.1
+  * This release add packaging files for DEB and RPM distributions and
+    fixes a couple of bugs:
+    - ICMP code to fill the tables was wrong and created segfault using
+      normal select, aggregation or group functions. The code has been
+      rewritten to work as the DNS code does and ICMP tests have been
+      added.
+    - Historically PacketQ parses all resource records but only saves
+      the first and last record, this would overwrite EDNS information
+      if it was not the first or last record. This has been fixed by
+      saving the EDNS information as it is found.
+  * Thanks to Anand Buddhdev (RIPE NCC) and Daniel Stirnimann (SWITCH)
+    for providing PCAPs to help resolve the bugs.
+  * Commits:
+    9c2627f Fix CID 1439421
+    5423c1d Fix #17: Save EDNS information when it's found
+    ecb166e Fix #48: ICMP parsing and a little better memory handling
+    0052024 Fix #45: Add packaging files
 * Tue May 30 2017 Jerry Lundström <lundstrom.jerry@gmail.com> 1.3.0-1
 - Release 1.3.0
   * First release under DNS-OARC management with license changed to GPL v3.0,