--- a/preseed/preseed.cfg	Tue Dec 13 20:17:57 2011 +0200
+++ b/preseed/preseed.cfg	Tue Dec 13 20:52:30 2011 +0200
@@ -38,7 +38,7 @@
 
 ## Static network configuration.
 # XXX: this is for asdf.paivola.fi
-d-i netcfg/get_hostname                 string asdf
+d-i netcfg/get_hostname                 string {NET_HOSTNAME}
 d-i netcfg/get_domain                   string paivola.fi
 d-i netcfg/get_ipaddress                string {NET_IPADDR}
 d-i netcfg/get_netmask                  string 255.255.255.0
@@ -308,7 +308,7 @@
 # Keep 'standard' task
 # http://wiki.debian.org/tasksel#A.22standard.22_task
 # this includes exim and mutt
-tasksel tasksel/first           multiselect standard ssh-server
+tasksel tasksel/first           multiselect standard, ssh-server
 
 # Individual additional packages to install
 d-i pkgsel/include              string \