diff --git a/CHANGES b/CHANGES
index dc2a3e1..b3ef435 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,26 @@
+2021-11-05 Jerry Lundström
+
+    Release 1.5.0
+
+    This release fixes issues with CSV and JSON w.r.t. quoted strings. CSV
+    output now conforms to RFC4180 and JSON output conforms to RFC8259.
+    Also added a new option (`--rfc1035`) to output and quote domain names
+    as described in RFC1035.
+
+    Other changes:
+    - Update debian control files
+    - Fix typo in `--help` text
+    - Fix OpenBSD clang++ compiler warnings
+    - `Output::add_int()`: Fix potential memory overwrite
+
+    8206e0f OpenBSD clang warnings
+    6c1247f Code format
+    d6c82d4 New option to escape DNS names
+    2bf6f26 Fix typo in --help around --xml parameter
+    9c95d15 Conform to CSV/JSON RFCs
+    feb0596 debhelper
+    be37ad0 Bye Travis
+
 2020-10-23 Jerry Lundström
 
     Release 1.4.3
diff --git a/Makefile.am b/Makefile.am
index 20b40d7..edbf242 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (c) 2017-2020, OARC, Inc.
+# Copyright (c) 2017-2021, OARC, Inc.
 # Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
 # All rights reserved.
 #
diff --git a/README.md b/README.md
index e2213ce..944e975 100644
--- a/README.md
+++ b/README.md
@@ -103,12 +103,13 @@ packetq -d -p8080 -w html/ -r pcap/
 - Magnus Lundén [@ripoff](https://github.com/ripoff)
 - Roger Murray [@romu42](https://github.com/romu42)
 - Henrik Levkowetz [@levkowetz](https://github.com/levkowetz)
+- Petr Špaček [@pspacek](https://github.com/pspacek)
 
 See also the [full list of contributors](https://github.com/DNS-OARC/PacketQ/graphs/contributors).
 
 ## Copyright
 
-Copyright (c) 2017-2020, OARC, Inc.
+Copyright (c) 2017-2021, OARC, Inc.
 
 Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
 
diff --git a/autogen.sh b/autogen.sh
index a8fef2c..f2c6359 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (c) 2017-2020, OARC, Inc.
+# Copyright (c) 2017-2021, OARC, Inc.
 # Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
 # All rights reserved.
 #
diff --git a/configure.ac b/configure.ac
index 2309b50..f8463f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# Copyright (c) 2017-2020, OARC, Inc.
+# Copyright (c) 2017-2021, OARC, Inc.
 # Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
 # All rights reserved.
 #
@@ -18,7 +18,7 @@
 # along with PacketQ.  If not, see <http://www.gnu.org/licenses/>.
 
 AC_PREREQ(2.61)
-AC_INIT([packetq], [1.4.3], [admin@dns-oarc.net], [packetq], [https://github.com/DNS-OARC/packetq/issues])
+AC_INIT([packetq], [1.5.0], [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 9334f2f..067254e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,28 @@
+packetq (1.5.0-1~unstable+1) unstable; urgency=low
+
+  * Release 1.5.0
+
+    This release fixes issues with CSV and JSON w.r.t. quoted strings. CSV
+    output now conforms to RFC4180 and JSON output conforms to RFC8259.
+    Also added a new option (`--rfc1035`) to output and quote domain names
+    as described in RFC1035.
+
+    Other changes:
+    - Update debian control files
+    - Fix typo in `--help` text
+    - Fix OpenBSD clang++ compiler warnings
+    - `Output::add_int()`: Fix potential memory overwrite
+
+    8206e0f OpenBSD clang warnings
+    6c1247f Code format
+    d6c82d4 New option to escape DNS names
+    2bf6f26 Fix typo in --help around --xml parameter
+    9c95d15 Conform to CSV/JSON RFCs
+    feb0596 debhelper
+    be37ad0 Bye Travis
+
+ -- Jerry Lundström <lundstrom.jerry@gmail.com>  Fri, 05 Nov 2021 14:02:24 +0100
+
 packetq (1.4.3-1~unstable+1) unstable; urgency=low
 
   * Release 1.4.3
diff --git a/debian/copyright b/debian/copyright
index e6b4ed7..e2c24b6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,12 +3,12 @@ Upstream-Name: drool
 Source: https://github.com/DNS-OARC/drool
 
 Files: *
-Copyright: 2017-2020, OARC, Inc.
+Copyright: 2017-2021, OARC, Inc.
            2011-2017, IIS - The Internet Foundation in Sweden
 License: GPLv3
 
 Files: debian/*
-Copyright: 2020 Jerry Lundström <lundstrom.jerry@gmail.com>
+Copyright: 2021 Jerry Lundström <lundstrom.jerry@gmail.com>
 License: GPLv3
 
 Files: src/Murmur/MurmurHash3.*
diff --git a/rpm/packetq.spec b/rpm/packetq.spec
index a25300f..ba279f2 100644
--- a/rpm/packetq.spec
+++ b/rpm/packetq.spec
@@ -1,5 +1,5 @@
 Name:           packetq
-Version:        1.4.3
+Version:        1.5.0
 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 Nov 05 2021 Jerry Lundström <lundstrom.jerry@gmail.com> 1.5.0-1
+- Release 1.5.0
+  * This release fixes issues with CSV and JSON w.r.t. quoted strings. CSV
+    output now conforms to RFC4180 and JSON output conforms to RFC8259.
+    Also added a new option (`--rfc1035`) to output and quote domain names
+    as described in RFC1035.
+  * Other changes:
+    - Update debian control files
+    - Fix typo in `--help` text
+    - Fix OpenBSD clang++ compiler warnings
+    - `Output::add_int()`: Fix potential memory overwrite
+  * Commits:
+    8206e0f OpenBSD clang warnings
+    6c1247f Code format
+    d6c82d4 New option to escape DNS names
+    2bf6f26 Fix typo in --help around --xml parameter
+    9c95d15 Conform to CSV/JSON RFCs
+    feb0596 debhelper
+    be37ad0 Bye Travis
 * Fri Oct 23 2020 Jerry Lundström <lundstrom.jerry@gmail.com> 1.4.3-1
 - Release 1.4.3
   * This release updates the DNS resource record types list with the new
diff --git a/src/Makefile.am b/src/Makefile.am
index d5ca448..b738f71 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (c) 2017-2020, OARC, Inc.
+# Copyright (c) 2017-2021, OARC, Inc.
 # Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
 # All rights reserved.
 #
diff --git a/src/dns.cpp b/src/dns.cpp
index 2e3be2f..ed39b9e 100644
--- a/src/dns.cpp
+++ b/src/dns.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2020, OARC, Inc.
+ * Copyright (c) 2017-2021, OARC, Inc.
  * Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
  * All rights reserved.
  *
diff --git a/src/dns.h b/src/dns.h
index dee3870..645f3a6 100644
--- a/src/dns.h
+++ b/src/dns.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2020, OARC, Inc.
+ * Copyright (c) 2017-2021, OARC, Inc.
  * Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
  * All rights reserved.
  *
diff --git a/src/icmp.cpp b/src/icmp.cpp
index b9ab406..0a0cab4 100644
--- a/src/icmp.cpp
+++ b/src/icmp.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2020, OARC, Inc.
+ * Copyright (c) 2017-2021, OARC, Inc.
  * Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
  * All rights reserved.
  *
diff --git a/src/icmp.h b/src/icmp.h
index c293946..c6ffa19 100644
--- a/src/icmp.h
+++ b/src/icmp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2020, OARC, Inc.
+ * Copyright (c) 2017-2021, OARC, Inc.
  * Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
  * All rights reserved.
  *
diff --git a/src/output.h b/src/output.h
index 5e88e38..821362c 100644
--- a/src/output.h
+++ b/src/output.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2020, OARC, Inc.
+ * Copyright (c) 2017-2021, OARC, Inc.
  * Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
  * All rights reserved.
  *
diff --git a/src/packet_handler.cpp b/src/packet_handler.cpp
index 287f197..7cacb29 100644
--- a/src/packet_handler.cpp
+++ b/src/packet_handler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2020, OARC, Inc.
+ * Copyright (c) 2017-2021, OARC, Inc.
  * Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
  * All rights reserved.
  *
diff --git a/src/packet_handler.h b/src/packet_handler.h
index 2ac2512..77a5e81 100644
--- a/src/packet_handler.h
+++ b/src/packet_handler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2020, OARC, Inc.
+ * Copyright (c) 2017-2021, OARC, Inc.
  * Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
  * All rights reserved.
  *
diff --git a/src/packetq.cpp b/src/packetq.cpp
index c7dcbaa..3042691 100644
--- a/src/packetq.cpp
+++ b/src/packetq.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2020, OARC, Inc.
+ * Copyright (c) 2017-2021, OARC, Inc.
  * Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
  * All rights reserved.
  *
diff --git a/src/packetq.h b/src/packetq.h
index bfce4c1..017662d 100644
--- a/src/packetq.h
+++ b/src/packetq.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2020, OARC, Inc.
+ * Copyright (c) 2017-2021, OARC, Inc.
  * Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
  * All rights reserved.
  *
diff --git a/src/pcap.cpp b/src/pcap.cpp
index 9cd3aae..1d8bbe0 100644
--- a/src/pcap.cpp
+++ b/src/pcap.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2020, OARC, Inc.
+ * Copyright (c) 2017-2021, OARC, Inc.
  * Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
  * All rights reserved.
  *
diff --git a/src/pcap.h b/src/pcap.h
index c437888..4a61d14 100644
--- a/src/pcap.h
+++ b/src/pcap.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2020, OARC, Inc.
+ * Copyright (c) 2017-2021, OARC, Inc.
  * Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
  * All rights reserved.
  *
diff --git a/src/reader.cpp b/src/reader.cpp
index e2f07c1..79cd40c 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2020, OARC, Inc.
+ * Copyright (c) 2017-2021, OARC, Inc.
  * Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
  * All rights reserved.
  *
diff --git a/src/reader.h b/src/reader.h
index 6b3e55e..2eb9e66 100644
--- a/src/reader.h
+++ b/src/reader.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2020, OARC, Inc.
+ * Copyright (c) 2017-2021, OARC, Inc.
  * Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
  * All rights reserved.
  *
diff --git a/src/refcountstring.h b/src/refcountstring.h
index b7b5f69..a5f32bf 100644
--- a/src/refcountstring.h
+++ b/src/refcountstring.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2020, OARC, Inc.
+ * Copyright (c) 2017-2021, OARC, Inc.
  * Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
  * All rights reserved.
  *
diff --git a/src/regression-test.sh b/src/regression-test.sh
index a751700..e159579 100755
--- a/src/regression-test.sh
+++ b/src/regression-test.sh
@@ -1,4 +1,4 @@
-# Copyright (c) 2017-2020, OARC, Inc.
+# Copyright (c) 2017-2021, OARC, Inc.
 # Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
 # All rights reserved.
 #
diff --git a/src/segzip.h b/src/segzip.h
index b736be6..e0b256e 100644
--- a/src/segzip.h
+++ b/src/segzip.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2020, OARC, Inc.
+ * Copyright (c) 2017-2021, OARC, Inc.
  * Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
  * All rights reserved.
  *
diff --git a/src/server.cpp b/src/server.cpp
index fe1e2f4..9fe1132 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2020, OARC, Inc.
+ * Copyright (c) 2017-2021, OARC, Inc.
  * Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
  * All rights reserved.
  *
diff --git a/src/server.h b/src/server.h
index a16fa62..0979430 100644
--- a/src/server.h
+++ b/src/server.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2020, OARC, Inc.
+ * Copyright (c) 2017-2021, OARC, Inc.
  * Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
  * All rights reserved.
  *
diff --git a/src/sql.cpp b/src/sql.cpp
index 537c112..b120e6f 100644
--- a/src/sql.cpp
+++ b/src/sql.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2020, OARC, Inc.
+ * Copyright (c) 2017-2021, OARC, Inc.
  * Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
  * All rights reserved.
  *
diff --git a/src/sql.h b/src/sql.h
index a01fb2b..531be8c 100644
--- a/src/sql.h
+++ b/src/sql.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2020, OARC, Inc.
+ * Copyright (c) 2017-2021, OARC, Inc.
  * Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
  * All rights reserved.
  *
diff --git a/src/tcp.cpp b/src/tcp.cpp
index feb3a1a..5a04c98 100644
--- a/src/tcp.cpp
+++ b/src/tcp.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2020, OARC, Inc.
+ * Copyright (c) 2017-2021, OARC, Inc.
  * Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
  * All rights reserved.
  *
diff --git a/src/tcp.h b/src/tcp.h
index fab083e..0992a62 100644
--- a/src/tcp.h
+++ b/src/tcp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2020, OARC, Inc.
+ * Copyright (c) 2017-2021, OARC, Inc.
  * Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
  * All rights reserved.
  *
diff --git a/src/test/Makefile.am b/src/test/Makefile.am
index 1baf6c8..827d091 100644
--- a/src/test/Makefile.am
+++ b/src/test/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (c) 2017-2020, OARC, Inc.
+# Copyright (c) 2017-2021, OARC, Inc.
 # Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
 # All rights reserved.
 #
diff --git a/src/test/test1.sh b/src/test/test1.sh
index 535b80e..2ec488c 100755
--- a/src/test/test1.sh
+++ b/src/test/test1.sh
@@ -1,5 +1,5 @@
 #!/bin/sh -e
-# Copyright (c) 2017-2020, OARC, Inc.
+# Copyright (c) 2017-2021, OARC, Inc.
 # Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
 # All rights reserved.
 #
diff --git a/src/test/test2.sh b/src/test/test2.sh
index b140fc9..7ce7f60 100755
--- a/src/test/test2.sh
+++ b/src/test/test2.sh
@@ -1,5 +1,5 @@
 #!/bin/sh -e
-# Copyright (c) 2017-2020, OARC, Inc.
+# Copyright (c) 2017-2021, OARC, Inc.
 # Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
 # All rights reserved.
 #
diff --git a/src/test/test3.sh b/src/test/test3.sh
index a2e1867..c91180b 100755
--- a/src/test/test3.sh
+++ b/src/test/test3.sh
@@ -1,5 +1,5 @@
 #!/bin/sh -e
-# Copyright (c) 2017-2020, OARC, Inc.
+# Copyright (c) 2017-2021, OARC, Inc.
 # Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
 # All rights reserved.
 #
diff --git a/src/test/test4.sh b/src/test/test4.sh
index dffc81d..16fc866 100755
--- a/src/test/test4.sh
+++ b/src/test/test4.sh
@@ -1,5 +1,5 @@
 #!/bin/sh -e
-# Copyright (c) 2017-2020, OARC, Inc.
+# Copyright (c) 2017-2021, OARC, Inc.
 # Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
 # All rights reserved.
 #
diff --git a/src/test/test5.sh b/src/test/test5.sh
index c4c495f..131625c 100755
--- a/src/test/test5.sh
+++ b/src/test/test5.sh
@@ -1,5 +1,5 @@
 #!/bin/sh -e
-# Copyright (c) 2017-2020, OARC, Inc.
+# Copyright (c) 2017-2021, OARC, Inc.
 # Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
 # All rights reserved.
 #
diff --git a/src/test/test6.sh b/src/test/test6.sh
index 5e5fa39..a082aa2 100755
--- a/src/test/test6.sh
+++ b/src/test/test6.sh
@@ -1,5 +1,5 @@
 #!/bin/sh -e
-# Copyright (c) 2017-2020, OARC, Inc.
+# Copyright (c) 2017-2021, OARC, Inc.
 # Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
 # All rights reserved.
 #
diff --git a/src/test/test7.sh b/src/test/test7.sh
index 62c87b0..ee7124d 100755
--- a/src/test/test7.sh
+++ b/src/test/test7.sh
@@ -1,5 +1,5 @@
 #!/bin/sh -e
-# Copyright (c) 2017-2020, OARC, Inc.
+# Copyright (c) 2017-2021, OARC, Inc.
 # Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
 # All rights reserved.
 #
diff --git a/src/variant.h b/src/variant.h
index 99bbe9a..a0512a6 100644
--- a/src/variant.h
+++ b/src/variant.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2020, OARC, Inc.
+ * Copyright (c) 2017-2021, OARC, Inc.
  * Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
  * All rights reserved.
  *