diff -Naur dovecot-1.0.5/doc/mkcert.sh dovecot-1.0.5-magellan/doc/mkcert.sh
--- dovecot-1.0.5/doc/mkcert.sh	2007-05-19 13:14:04.000000000 +0200
+++ dovecot-1.0.5-magellan/doc/mkcert.sh	2007-10-16 02:16:56.000000000 +0200
@@ -4,14 +4,14 @@
 # Edit dovecot-openssl.cnf before running this.
 
 OPENSSL=${OPENSSL-openssl}
-SSLDIR=${SSLDIR-/etc/ssl}
-OPENSSLCONFIG=${OPENSSLCONFIG-dovecot-openssl.cnf}
+SSLDIR=${SSLDIR-/etc/dovecot/ssl}
+OPENSSLCONFIG=${OPENSSLCONFIG-/etc/dovecot/ssl/dovecot-openssl.cnf}
 
-CERTDIR=$SSLDIR/certs
-KEYDIR=$SSLDIR/private
+CERTDIR=$SSLDIR
+KEYDIR=$SSLDIR
 
 CERTFILE=$CERTDIR/dovecot.pem
-KEYFILE=$KEYDIR/dovecot.pem
+KEYFILE=$KEYDIR/dovecot.key
 
 if [ ! -d $CERTDIR ]; then
   echo "$SSLDIR/certs directory doesn't exist"
@@ -34,6 +34,7 @@
 fi
 
 $OPENSSL req -new -x509 -nodes -config $OPENSSLCONFIG -out $CERTFILE -keyout $KEYFILE -days 365 || exit 2
-chmod 0600 $KEYFILE
+chown root:root $CERTFILE $KEYFILE
+chmod 0600 $CERTFILE $KEYFILE
 echo 
 $OPENSSL x509 -subject -fingerprint -noout -in $CERTFILE || exit 2