diff -Nru dovecot-2.2.2.orig/doc/example-config/conf.d/10-ssl.conf dovecot-2.2.2/doc/example-config/conf.d/10-ssl.conf
--- dovecot-2.2.2.orig/doc/example-config/conf.d/10-ssl.conf	2013-05-20 09:01:57.619437034 +0200
+++ dovecot-2.2.2/doc/example-config/conf.d/10-ssl.conf	2013-05-20 09:02:27.065041953 +0200
@@ -9,8 +9,8 @@
 # dropping root privileges, so keep the key file unreadable by anyone but
 # root. Included doc/mkcert.sh can be used to easily generate self-signed
 # certificate, just make sure to update the domains in dovecot-openssl.cnf
-ssl_cert = </etc/ssl/certs/dovecot.pem
-ssl_key = </etc/ssl/private/dovecot.pem
+ssl_cert = </etc/ssl/certs/dovecot.crt
+ssl_key = </etc/ssl/keys/dovecot.key
 
 # If key file is password protected, give the password here. Alternatively
 # give it when starting dovecot with -p parameter. Since this file is often
diff -Nru dovecot-2.2.2.orig/doc/example-config/conf.d/auth-system.conf.ext dovecot-2.2.2/doc/example-config/conf.d/auth-system.conf.ext
--- dovecot-2.2.2.orig/doc/example-config/conf.d/auth-system.conf.ext	2013-05-20 09:01:57.619437034 +0200
+++ dovecot-2.2.2/doc/example-config/conf.d/auth-system.conf.ext	2013-05-20 09:02:27.065041953 +0200
@@ -7,12 +7,12 @@
 # PAM is typically used with either userdb passwd or userdb static.
 # REMEMBER: You'll need /etc/pam.d/dovecot file created for PAM
 # authentication to actually work. <doc/wiki/PasswordDatabase.PAM.txt>
-passdb {
-  driver = pam
+#passdb {
+  #driver = pam
   # [session=yes] [setcred=yes] [failure_show_msg=yes] [max_requests=<n>]
   # [cache_key=<key>] [<service name>]
   #args = dovecot
-}
+#}
 
 # System users (NSS, /etc/passwd, or similiar).
 # In many systems nowadays this uses Name Service Switch, which is
@@ -26,11 +26,11 @@
 # Shadow passwords for system users (NSS, /etc/shadow or similiar).
 # Deprecated by PAM nowadays.
 # <doc/wiki/PasswordDatabase.Shadow.txt>
-#passdb {
-  #driver = shadow
+passdb {
+  driver = shadow
   # [blocking=no]
   #args = 
-#}
+}
 
 # PAM-like authentication for OpenBSD.
 # <doc/wiki/PasswordDatabase.BSDAuth.txt>