diff --git a/debian/changelog b/debian/changelog
index 8a9b81b..0a08df8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 patroni (1.6.4-2) UNRELEASED; urgency=medium
 
+  [ Michael Banck ]
+  * debian/pg_clonecluster_patroni: quote connstr in pg_createcluster
+    invocation (Closes: #953623).
 
  -- Debian PostgreSQL Maintainers <team+postgresql@tracker.debian.org>  Mon, 10 Feb 2020 10:03:07 +0100
 
diff --git a/debian/pg_clonecluster_patroni b/debian/pg_clonecluster_patroni
index df2770c..23edf7b 100755
--- a/debian/pg_clonecluster_patroni
+++ b/debian/pg_clonecluster_patroni
@@ -40,5 +40,5 @@ then
     pg_dropcluster $VERSION $CLUSTER
 fi
 
-pg_createcluster --start-conf=manual $VERSION $CLUSTER && rm -rf $DATADIR && pg_basebackup --pgdata $DATADIR -X stream --dbname=$CONNSTR
+pg_createcluster --start-conf=manual $VERSION $CLUSTER && rm -rf $DATADIR && pg_basebackup --pgdata $DATADIR -X stream --dbname="$CONNSTR"
 exit $?