diff --git a/ChangeLog b/ChangeLog
index 34f535e..0f1f119 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2023-07-11 - Version 3.5
+
+This release is a maintenance release that fixes issues reported since
+the past six months and adds support to PostgreSQL 16.
+
+  - Fix pgcluu for PG16 changes on pg_stat_user_indexes.
+  - Fix live/dead tuples statistics. Thanks to Frederic Yhuel for the patch.
+  - Add e as expression for kind of extended statistics.
+  - Add --disable-pidstat option to disable the collect of metrics from the
+    pidstat command. This can be useful with old versions of pidstat that do
+    not support the -U option. Thanks to Guillaume Lelarge for the report.
+  - If on a secondary server, don't execute pg_current_wal_lsn(). Thanks to
+    Guillaume Lelarge for the patch.
+    Use relispartition only for PG version 10 and upper. Thanks to Guillaume
+    Lelarge for the patch.
+
 2022-12-26 - Version 3.4
 
 This release is a maintenance release that fixes issues reported since
diff --git a/LICENSE b/LICENSE
index a914656..b05136c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2012-2022, Gilles Darold
+Copyright (c) 2012-2023, Gilles Darold
 
 Permission to use, copy, modify, and distribute this software and its
 documentation for any purpose, without fee, and without a written agreement
diff --git a/META.yml b/META.yml
index 2cb0426..ad1647f 100644
--- a/META.yml
+++ b/META.yml
@@ -25,4 +25,4 @@ resources:
     git: git@github.com:darold/pgcluu.git
     type: git
     web: http://pgcluu.darold.net/
-version: 3.3
+version: 3.5
diff --git a/README b/README
index 3200805..32d7e86 100644
--- a/README
+++ b/README
@@ -693,7 +693,7 @@ GENERATING REPORTS
     configuration directive in pgcluu.conf
 
 LICENSE
-    Copyright (c) 2012-2021, Gilles Darold
+    Copyright (c) 2012-2023, Gilles Darold
 
     pgCluu is licenced under the PostgreSQL Licence a liberal Open Source
     license, similar to the BSD or MIT licenses. That mean that all parts of
diff --git a/cgi-bin/pgcluu.cgi b/cgi-bin/pgcluu.cgi
index e558204..21b127a 100755
--- a/cgi-bin/pgcluu.cgi
+++ b/cgi-bin/pgcluu.cgi
@@ -7,7 +7,7 @@
 # For license terms, see the LICENSE file.
 #
 # Author: Gilles Darold
-# Copyright: (C) 2012-2021 Gilles Darold - All rights reserved.
+# Copyright: (C) 2012-2023 Gilles Darold - All rights reserved.
 #------------------------------------------------------------------------------
 use vars qw($VERSION $PROGRAM);
 
@@ -25,7 +25,7 @@ use POSIX qw(locale_h sys_wait_h ceil strftime);
 setlocale(LC_ALL, 'C');
 use Storable qw(store_fd fd_retrieve);
 
-$VERSION = '3.1';
+$VERSION = '3.5';
 $PROGRAM = 'pgCluu';
 
 
@@ -7811,7 +7811,7 @@ sub html_footer
         print qq{
       <hr>
       <footer>
-        <p>&copy; Gilles Darold 2012-2021</p>
+        <p>&copy; Gilles Darold 2012-2023</p>
 	<p>Report generated by <a href="http://pgcluu.darold.net/">$PROGRAM</a> $VERSION.</p>
       </footer>
 
diff --git a/doc/pgCluu.pod b/doc/pgCluu.pod
index 7201b29..f421cad 100644
--- a/doc/pgCluu.pod
+++ b/doc/pgCluu.pod
@@ -709,7 +709,7 @@ configuration directive in pgcluu.conf
 
 =head1 LICENSE
 
-Copyright (c) 2012-2021, Gilles Darold
+Copyright (c) 2012-2023, Gilles Darold
 
 pgCluu is licenced under the PostgreSQL Licence a liberal Open Source license,
 similar to the BSD or MIT licenses. That mean that all parts of the program
diff --git a/pgcluu b/pgcluu
index 69faac8..9f4b6fd 100755
--- a/pgcluu
+++ b/pgcluu
@@ -7,7 +7,7 @@
 # For license terms, see the LICENSE file.
 #
 # Author: Gilles Darold
-# Copyright: (C) 2012-2022 Gilles Darold - All rights reserved.
+# Copyright: (C) 2012-2023 Gilles Darold - All rights reserved.
 #------------------------------------------------------------------------------
 use vars qw($VERSION $PROGRAM);
 
@@ -24,7 +24,7 @@ use POSIX qw(locale_h sys_wait_h ceil strftime);
 setlocale(LC_ALL, 'C');
 use Storable qw(store_fd fd_retrieve);
 
-$VERSION = '3.4';
+$VERSION = '3.5';
 $PROGRAM = 'pgCluu';
 
 # Global variables
diff --git a/pgcluu_collectd b/pgcluu_collectd
index b0bca79..2770538 100755
--- a/pgcluu_collectd
+++ b/pgcluu_collectd
@@ -7,7 +7,7 @@
 # For license terms, see the LICENSE file.
 #
 # Author: Gilles Darold
-# Copyright: (C) 2012-2022 Gilles Darold - All rights reserved.
+# Copyright: (C) 2012-2023 Gilles Darold - All rights reserved.
 #------------------------------------------------------------------------------
 use vars qw($VERSION $PROGRAM);
 use strict qw(vars subs);
@@ -26,7 +26,7 @@ use constant UMASK => 0022;
 
 $| = 1;
 
-$VERSION = '3.4';
+$VERSION = '3.5';
 $PROGRAM = 'pgcluu_collectd';
 
 $SIG{'CHLD'} = 'DEFAULT';