diff --git a/bin/xen-create-image b/bin/xen-create-image
index ca0d76c..3739f6b 100755
--- a/bin/xen-create-image
+++ b/bin/xen-create-image
@@ -857,7 +857,7 @@ my $PASSWORD = '';
 #
 # Define some fallback password length
 #
-my $default_genpass_len = 8;
+my $default_genpass_len = 23;
 
 
 # Minor helpers for reducing code duplication
diff --git a/debian/changelog b/debian/changelog
index eae3fdb..ffda092 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,7 @@ xen-tools (4.4+dev-1) UNRELEASED; urgency=low
     + --password overrides --genpass. (Closes: #764143) Based on patch by
       Santiago Vila.
     + Add password length sanity check with fallback to default length.
+    + Raise default password length from 8 to 23.
 
     [ Santiago Vila ]
     + Fix unaligned maxmem output of xen-create-image. (Closes: #764126)