--- a/preseed/preseed.cfg	Fri Jan 27 10:39:08 2012 +0200
+++ b/preseed/preseed.cfg	Fri Jan 27 12:07:32 2012 +0200
@@ -319,7 +319,8 @@
 
 # Individual additional packages to install
 d-i pkgsel/include              string \
-    sudo screen vim
+    {PACKAGE_INCLUDES[*]}
+
 
 # Whether to upgrade packages after debootstrap.
 # Allowed values: none, safe-upgrade, full-upgrade
@@ -399,10 +400,12 @@
 # still a usable /target directory. You can chroot to /target and use it
 # directly, or use the apt-install and in-target commands to easily install
 # packages and run commands in the target system.
-#d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh
+d-i preseed/late_command                string  \
+    {PRESEED_LATE_COMMAND}
 
 
 
 
 ### Extra preseed files
-d-i preseed/include                     string passwords.cfg host.cfg
+d-i preseed/include                     string  \
+    {PRESEED_INCLUDE}