diff --git a/scripts/build/source_tar b/scripts/build/source_tar
index 566d39c20..2a1ae960b 100755
--- a/scripts/build/source_tar
+++ b/scripts/build/source_tar
@@ -46,8 +46,8 @@ Acquire_lockfile
 rm -f ${LB_IMAGE_NAME}-source.debian.tar.bz2 ${LB_IMAGE_NAME}-source.debian.tar.gz ${LB_IMAGE_NAME}-source.debian.tar.lz ${LB_IMAGE_NAME}-source.debian.tar
 rm -f ${LB_IMAGE_NAME}-source.live.tar.bz2 ${LB_IMAGE_NAME}-source.live.tar.gz ${LB_IMAGE_NAME}-source.live.tar.lz ${LB_IMAGE_NAME}-source.live.tar
 
-tar cf ${LB_IMAGE_NAME}-source.debian.tar source/debian
-tar cf ${LB_IMAGE_NAME}-source.live.tar source/live
+tar cf ${LB_IMAGE_NAME}-source.debian.tar --sort=name source/debian
+tar cf ${LB_IMAGE_NAME}-source.live.tar --sort=name source/live
 
 touch ${LB_IMAGE_NAME}-source.debian.tar -d@${SOURCE_DATE_EPOCH}
 touch ${LB_IMAGE_NAME}-source.live.tar -d@${SOURCE_DATE_EPOCH}
diff --git a/test/rebuild.sh b/test/rebuild.sh
index c9490d399..1b5c70fb2 100755
--- a/test/rebuild.sh
+++ b/test/rebuild.sh
@@ -466,8 +466,9 @@ case "$DEBIAN_VERSION" in
 	mkdir -p config/bootloaders/grub-pc
 	# To have a 800x600 image and the title 'Live Boot Menu with GRUB', manually do some of the tweaks from binary_syslinux
 	# 1) Use the sharper 800x600 image instead of 640x480
-	# 2) Because the image is provided, the timestamp of theme.txt must be adjusted, otherwise it would be the date from the provide live-build folder
+	# 2) Because the image is provided, the timestamp of theme.txt must be adjusted, otherwise it would be the date from the provided live-build folder
 	ln -s ../../isolinux/splash800x600.png config/bootloaders/grub-pc/splash.png
+	touch ${LIVE_BUILD}/share/bootloaders/grub-pc/live-theme -d@${SOURCE_DATE_EPOCH}
 	touch ${LIVE_BUILD}/share/bootloaders/grub-pc/live-theme/theme.txt -d@${SOURCE_DATE_EPOCH}
 	;;
 *)