diff -Nru tasksel-2.70ubuntu3/debian/changelog tasksel-2.70ubuntu4/debian/changelog
--- tasksel-2.70ubuntu3/debian/changelog	2008-03-11 13:58:15.000000000 +0100
+++ tasksel-2.70ubuntu4/debian/changelog	2008-03-12 14:13:35.000000000 +0100
@@ -1,3 +1,9 @@
+tasksel (2.70ubuntu4) hardy; urgency=low
+
+  * Fixed Makefile and added postinst script for mail-server task
+
+ -- Ante Karamatic <ivoks@ubuntu.com>  Wed, 12 Mar 2008 14:13:19 +0100
+
 tasksel (2.70ubuntu3) hardy; urgency=low
 
   * Don't install discover1 and xresprobe in desktop.preinst; xserver-xorg
diff -Nru /tmp/bJ1MIychlK/tasksel-2.70ubuntu3/info/mail-server.postinst /tmp/UOPMnmSOiU/tasksel-2.70ubuntu4/info/mail-server.postinst
--- tasksel-2.70ubuntu3/info/mail-server.postinst	1970-01-01 01:00:00.000000000 +0100
+++ tasksel-2.70ubuntu4/info/mail-server.postinst	2008-03-12 14:19:20.000000000 +0100
@@ -0,0 +1,93 @@
+#!/bin/sh
+
+set -e
+
+if [ -f /usr/sbin/postconf ]; then
+
+# Dovecot's config options for Ubuntu mail-server task
+
+cat << EOPATCH | patch -s -p0 -d /etc/dovecot
+--- dovecot.conf.orig	2008-02-07 12:57:38.000000000 +0100
++++ dovecot.conf	2008-02-07 13:00:54.000000000 +0100
+@@ -211,7 +211,7 @@
+ #
+ # <doc/wiki/MailLocation.txt>
+ #
+-#mail_location = 
++mail_location = maildir:~/Maildir
+ 
+ # If you need to set multiple mailbox locations or want to change default
+ # namespace settings, you can do it by defining namespace sections.
+@@ -560,7 +560,7 @@
+   #     but not both. Thunderbird separates these two by forcing server to
+   #     accept '/' suffix in mailbox names in subscriptions list.
+   # The list is space-separated.
+-  #imap_client_workarounds = outlook-idle
++  imap_client_workarounds = delay-newmail, outlook-idle
+ }
+   
+ ##
+@@ -643,7 +643,7 @@
+   #     Outlook Express and Netscape Mail breaks if end of headers-line is
+   #     missing. This option simply sends it if it's missing.
+   # The list is space-separated.
+-  #pop3_client_workarounds = 
++  pop3_client_workarounds = outlook-no-nuls
+ }
+ 
+ ##
+@@ -761,7 +761,7 @@
+   # Space separated list of wanted authentication mechanisms:
+   #   plain login digest-md5 cram-md5 ntlm rpa apop anonymous gssapi
+   # NOTE: See also disable_plaintext_auth setting.
+-  mechanisms = plain
++  mechanisms = plain login
+
+   #
+   # Password database is used to verify user's password (and nothing more).
+@@ -977,7 +977,7 @@
+   #ssl_username_from_cert = no
+ 
+   # It's possible to export the authentication interface to other programs:
+-  #socket listen {
++  socket listen {
+     #master {
+       # Master socket provides access to userdb information. It's typically
+       # used to give Dovecot's local delivery agent access to userdb so it
+@@ -988,14 +988,16 @@
+       #user = 
+       #group = 
+     #}
+-    #client {
++    client {
+       # The client socket is generally safe to export to everyone. Typical use
+       # is to export it to your SMTP server so it can do SMTP AUTH lookups
+       # using it.
+-      #path = /var/run/dovecot/auth-client
+-      #mode = 0660
+-    #}
+-  #}
++      path = /var/spool/postfix/private/auth
++      mode = 0660
++      user = postfix
++      group = postfix
++    }
++  }
+ 
+   ## dovecot-lda specific settings
+   ##
+EOPATCH
+
+
+# Now some postfix stuff
+
+postconf -e "home_mailbox = Maildir/"
+postconf -e "smtpd_sasl_auth_enable = yes"
+postconf -e "smtpd_sasl_type = dovecot"
+postconf -e "smtpd_sasl_path = private/auth"
+postconf -e "smtpd_sasl_security_options = noanonymous"
+postconf -e "smtpd_sasl_local_domain = $myhostname"
+postconf -e "broken_sasl_auth_clients = yes"
+postconf -e "smtpd_recipient_restrictions = reject_unknown_sender_domain, reject_unknown_recipient_domain, reject_unauth_pipelining, permit_mynetworks, permit_sasl_authenticated"
+
+fi
diff -Nru /tmp/bJ1MIychlK/tasksel-2.70ubuntu3/Makefile /tmp/UOPMnmSOiU/tasksel-2.70ubuntu4/Makefile
--- tasksel-2.70ubuntu3/Makefile	2008-02-22 13:40:49.000000000 +0100
+++ tasksel-2.70ubuntu4/Makefile	2008-03-12 14:12:39.000000000 +0100
@@ -73,10 +73,10 @@
 	done
 	for script in info/*; do \
 		install -m 755 $$script $(DESTDIR)/usr/lib/tasksel/info/; \
-		for flavour in $(filter-out platform,$(UFLAVOURS)); do \
-			ln -s desktop.preinst $(DESTDIR)/usr/lib/tasksel/info/$$flavour-desktop.preinst; \
-		done; \
 	done
+	for flavour in $(filter-out platform,$(UFLAVOURS)); do \
+		ln -s desktop.preinst $(DESTDIR)/usr/lib/tasksel/info/$$flavour-desktop.preinst; \
+	done; \
 	for package in packages/*; do \
 		[ "$$package" = "packages/list" ] && continue; \
 		install -m 755 $$package $(DESTDIR)/usr/lib/tasksel/packages/; \