--- courier.old	2005-03-03 10:24:29.000000000 +0000
+++ courier	2005-03-03 11:44:57.000000000 +0000
@@ -49,6 +49,32 @@
 	[ -f ${sysconfdir}/${ACCESSFILE}.dat ] || ${sbindir}/makesmtpaccess
 
 	[ -f ${sysconfdir}/${ACCESSFILE}.dat ] || ${sbindir}/makesmtpaccess-msa
+
+	# After an upgrade, portage has a bad habbit of removing important foldes from /var/lib/courier
+
+	if [ ! -d /var/lib/courier/msgs ] ; then
+		einfo " Creating /var/lib/courier/msgs"
+		mkdir /var/lib/courier/msgs
+		chown mail:mail /var/lib/courier/msgs
+	fi
+
+	if [ ! -d /var/lib/courier/msgq ] ; then
+		einfo " Creating /var/lib/courier/msgq"
+		mkdir /var/lib/courier/msgq
+		chown mail:mail /var/lib/courier/msgq
+	fi
+
+	if [ ! -d /var/lib/courier/track ] ; then
+		einfo " Creating /var/lib/courier/track"
+		mkdir /var/lib/courier/track
+		chown mail:mail /var/lib/courier/track
+	fi
+
+	if [ ! -d /var/lib/courier/tmp ] ; then
+		einfo " Creating /var/lib/courier/tmp"
+		mkdir /var/lib/courier/tmp
+		chown mail:mail /var/lib/courier/tmp
+	fi
 }
 
 start() {