diff --git a/rpi-clone b/rpi-clone
index 22e53a4..e769e7f 100755
--- a/rpi-clone
+++ b/rpi-clone
@@ -62,8 +62,8 @@ confirm()
 	}
 
 # sfdisk is in fdisk package
-commands="rsync parted fdisk findmnt column fsck.vfat"
-packages="rsync parted util-linux mount bsdmainutils dosfstools"
+commands="rsync parted fdisk findmnt column fsck.vfat uuidgen"
+packages="rsync parted util-linux mount bsdmainutils dosfstools uuid-runtime"
 need_packages=""
 
 idx=1
@@ -567,6 +567,23 @@ ext_label()
 	printf -v "${4}" "%s" "$label_arg"
 	}
 
+change_disk_id()
+	{
+	case "$src_disk_table_type" in
+		msdos)
+			new_id=$(od -A n -t x -N 4 /dev/urandom | tr -d " ")
+			;;
+		gpt)
+			new_id=$(uuidgen)
+			;;
+		*)
+			qecho "  Unsupported partition table, cannot change Disk ID."
+			return 1
+			;;
+	esac
+	sfdisk --disk-id "$1" "$new_id"
+	}
+
 get_src_disk()
 	{
 	partition=${1#/dev/}
@@ -646,9 +663,9 @@ src_df_table=$(echo "$tmp" | sed "s/root/$dev/")
 n_src_parts=$(echo "$src_partition_table" | tail -n 1 | cut -d ":" -f 1)
 src_disk_size=$(echo "$src_partition_table" \
 				| grep "^/dev/$src_disk" | cut -d ":" -f 2 | tr -d 's')
-
-line=$(fdisk -l /dev/$src_disk | grep "Disk identifier:")
-src_disk_ID=${line#*x}
+src_disk_table_type=$(echo "$src_partition_table" \
+				| grep "^/dev/$src_disk" | cut -d ":" -f 6 )
+src_disk_ID=$(sfdisk --disk-id "/dev/$src_disk")
 
 src_mount_table=$(findmnt -o source,target -n -l \
 				| grep -e "^/dev/$src_disk" -e "^$src_root_dev" | tr -s " ")
@@ -1426,6 +1443,11 @@ Use -U for unattended even if initializing.
 	part="${src_part_base}$n_image_parts"
 	sfd1=$(echo "$sfd0" | sed "\/dev\/$part/s/size=[^,]*,//")
 
+	# Strip gpt last-lba marker, if any, that will needlessly limit to the src disk size.
+	sfd1=$(echo "$sfd1" | grep -v '^last-lba: ')
+	# Strip label-id, to let sfdisk generate a new disk id
+	sfd1=$(echo "$sfd1" | grep -v '^label-id: ')
+
 	if ((ext_part_num > 0 && !force_2_parts))
 	then
 		part="${src_part_base}$ext_part_num"
@@ -1460,23 +1482,16 @@ Use -U for unattended even if initializing.
 			printf "    Try running $PGM again.\n\n"
 
 			# Don't let dst disk keep source disk ID.  Can lead to remounts.
-			new_id=$(od -A n -t x -N 4 /dev/urandom | tr -d " ")
-			qprintf "x\ni\n0x$new_id\nr\nw\nq\n" | fdisk /dev/$dst_disk > /dev/null
+			change_disk_id "/dev/$dst_disk"
 			exit 1
 		fi
 	done
 	printf "\n    Resize success.\n"
-	printf "  Changing destination Disk ID ..."
-	sync
-	sleep 2
 
-	new_id=$(od -A n -t x -N 4 /dev/urandom | tr -d " ")
-	qprintf "x\ni\n0x$new_id\nr\nw\nq\n" | fdisk /dev/$dst_disk > /dev/null
 	sync
 	sleep 2
 	partprobe "/dev/$dst_disk"
 	sleep 2
-	echo ""
 
 	for ((p = n_image_parts + 1; p <= n_src_parts; p++))
 	do
@@ -1632,20 +1647,17 @@ else
 	start_sec=$(date '+%s')
 fi
 
-line=$(fdisk -l /dev/$dst_disk | grep "Disk identifier:")
-dst_disk_ID=${line#*x}
+dst_disk_ID=$(sfdisk --disk-id "/dev/$dst_disk")
 if [ "$dst_disk_ID" == "$src_disk_ID" ]
 then
 	qecho "Destination disk has same Disk ID as source, changing it."
-	new_id=$(od -A n -t x -N 4 /dev/urandom | tr -d " ")
-	qprintf "x\ni\n0x$new_id\nr\nw\nq\n" | fdisk /dev/$dst_disk | grep changed
+	change_disk_id "/dev/$dst_disk"
 	sync
 	sleep 2
 	partprobe "/dev/$dst_disk"
 	sleep 2
 
-	line=$(fdisk -l /dev/$dst_disk | grep "Disk identifier:")
-	dst_disk_ID=${line#*x}
+	dst_disk_ID=$(sfdisk --disk-id "/dev/$dst_disk")
 	if [ "$dst_disk_ID" == "$src_disk_ID" ]
 	then
 		qecho "  Failed to set a new Disk ID."