diff --git a/scripts/integrate-distro.sh b/scripts/integrate-distro.sh
index 39699b59..2f54c7aa 100644
--- a/scripts/integrate-distro.sh
+++ b/scripts/integrate-distro.sh
@@ -501,6 +501,7 @@ run_parted()
 create_partition_table()
 {
 	assert_not_mounted
+	local max=$(LANG=POSIX parted -s $install_dev print | sed '/Disk/ !d; s/.*: *//')
 
 	# FIXME mkpart primary 40G 100% doesn't work on nbd
 	_cat << EOT | run_parted
@@ -512,7 +513,7 @@ create_partition_table()
 	|name 2 boot
 	|mkpart primary 10G 40G
 	|name 3 swap
-	|mkpart primary 40G 100G
+	|mkpart primary 40G $max
 	|name 4 root
 EOT