diff --git a/build.sh b/build.sh
index c0b19aa..325b2ea 100755
--- a/build.sh
+++ b/build.sh
@@ -344,6 +344,7 @@ case "$IMAGE_TYPE" in
 		[ $? -eq 0 ] || failure
 
 		# Use the same grub theme as in the live images
+		# Until debian-cd is smart enough: http://bugs.debian.org/1003927
 		cp -f kali-config/common/bootloaders/grub-pc/grub-theme.in simple-cdd/debian-cd/data/$CODENAME/grub-theme.in
 
 		# Keep 686-pae udebs as we changed the default from 686
diff --git a/simple-cdd/disc-end-hook b/simple-cdd/disc-end-hook
index 224a67f..0b03a65 100755
--- a/simple-cdd/disc-end-hook
+++ b/simple-cdd/disc-end-hook
@@ -9,6 +9,8 @@ CDDIR=$4
 ARCHES=$5
 
 # Copy grub theme assets
+# Until debian-cd picks them from d-i automatically:
+# http://bugs.debian.org/1003927
 cp -r $BASEDIR/../../kali-config/common/bootloaders/grub-pc/theme \
       $BASEDIR/../../kali-config/common/bootloaders/grub-pc/splash.png \
       $CDDIR/boot/grub/