diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4807b66..49496eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+2023-08-29
+==========
+v2.18
+- Updated for PostgreSQL 16
+
 2022-08-25
 ==========
 v2.17
diff --git a/README.md b/README.md
index 7c47f41..e4186e4 100644
--- a/README.md
+++ b/README.md
@@ -385,7 +385,7 @@ Compatibility
 
 This module has been tested on:
 
-* **Postgres 9.4, 9.5, 9.6, 10, 11, 12, 13, 14, 15**
+* **Postgres 9.4, 9.5, 9.6, 10, 11, 12, 13, 14, 15, 16**
 
 If you end up needing to change something to get this running on another system, send us the diff and we'll try to work it in!
 
@@ -398,7 +398,7 @@ Build
 
 Specify versions:
 
-    export VER=2.17
+    export VER=2.18
     export PGSHRT=11
 
 Make sure `Makefile` points to the correct `pg_config` for the specified version, since `rpmbuild` doesn't respect env variables:
@@ -416,11 +416,11 @@ Execute rpmbuild:
 
 Install RPM:
 
-    rpm -Uv rpmbuild/RPMS/x86_64/postgresql11-hll-2.16.x86_64.rpm
+    rpm -Uv rpmbuild/RPMS/x86_64/postgresql11-hll-2.18.x86_64.rpm
 
 And if you want the debugging build:
 
-    rpm -Uv rpmbuild/RPMS/x86_64/postgresql11-hll-debuginfo-2.17.x86_64.rpm
+    rpm -Uv rpmbuild/RPMS/x86_64/postgresql11-hll-debuginfo-2.18.x86_64.rpm
 
 
 ## From source ##
@@ -471,7 +471,7 @@ And then just verify it's there:
                             List of installed extensions
           Name   | Version |   Schema   |            Description
         ---------+---------+------------+-----------------------------------
-         hll     | 2.17    | public     | type for storing hyperloglog data
+         hll     | 2.18    | public     | type for storing hyperloglog data
          plpgsql | 1.0     | pg_catalog | PL/pgSQL procedural language
         (2 rows)
 
@@ -480,8 +480,8 @@ Tests
 
 Start a PostgreSQL server running in default port:
 
-    pg_ctl -D data -l logfile -c start
     initdb -D data
+    pg_ctl -D data -l logfile -c start
 
 Run the tests:
 
diff --git a/expected/setup.out b/expected/setup.out
index 1b85514..8b94cd9 100644
--- a/expected/setup.out
+++ b/expected/setup.out
@@ -6,3 +6,4 @@ ALTER EXTENSION hll UPDATE TO '2.14';
 ALTER EXTENSION hll UPDATE TO '2.15';
 ALTER EXTENSION hll UPDATE TO '2.16';
 ALTER EXTENSION hll UPDATE TO '2.17';
+ALTER EXTENSION hll UPDATE TO '2.18';
diff --git a/hll.control b/hll.control
index 9a672c0..65352dc 100644
--- a/hll.control
+++ b/hll.control
@@ -14,5 +14,5 @@
 
 # hll extension
 comment = 'type for storing hyperloglog data'
-default_version = '2.17'
+default_version = '2.18'
 module_pathname = '$libdir/hll'
diff --git a/sql/setup.sql b/sql/setup.sql
index 1b85514..8b94cd9 100644
--- a/sql/setup.sql
+++ b/sql/setup.sql
@@ -6,3 +6,4 @@ ALTER EXTENSION hll UPDATE TO '2.14';
 ALTER EXTENSION hll UPDATE TO '2.15';
 ALTER EXTENSION hll UPDATE TO '2.16';
 ALTER EXTENSION hll UPDATE TO '2.17';
+ALTER EXTENSION hll UPDATE TO '2.18';
diff --git a/update/hll--2.17--2.18.sql b/update/hll--2.17--2.18.sql
new file mode 100644
index 0000000..b1af672
--- /dev/null
+++ b/update/hll--2.17--2.18.sql
@@ -0,0 +1 @@
+-- Empty upgrade file to upgrade extension from 2.16 to 2.17