diff --git a/debian/changelog b/debian/changelog
index c2b94b7..730fca9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ patroni (1.6.4-2) UNRELEASED; urgency=medium
     invocation (Closes: #953623).
   * debian/pg_createcluster_patroni: remove vip-manager file before appending
     to it, patch by Tomas Pospisek (Closes: #953147).
+  * debian/pg_createcluster_patroni: Improve parsing of pg_lsclusters output
+    when determining port number, patch by Tomas Pospisek (Closes: #953157).
 
  -- Debian PostgreSQL Maintainers <team+postgresql@tracker.debian.org>  Mon, 10 Feb 2020 10:03:07 +0100
 
diff --git a/debian/pg_createconfig_patroni b/debian/pg_createconfig_patroni
index 840e9ac..73ecee1 100755
--- a/debian/pg_createconfig_patroni
+++ b/debian/pg_createconfig_patroni
@@ -60,7 +60,7 @@ fi
 
 if [ -z "$PORT" ]; then
     # try to guess next free port
-    PORT=$(($(pg_lsclusters | awk '{print $3}' | grep -v Port | sort -n | tail -1) + 1))
+    PORT=$(($(pg_lsclusters | tail -n +2 | awk '{print $3}' | sort -n | tail -1) + 1))
     if [ "$PORT" -eq 1 ]; then
 	# No cluster exists yet, use default port
 	PORT=5432