diff -ur pykolab-0.5.11/pykolab/setup/setup_mta.py pykolab-0.5.11.mga/pykolab/setup/setup_mta.py
--- pykolab-0.5.11/pykolab/setup/setup_mta.py	2013-01-09 07:03:35.000000000 -0700
+++ pykolab-0.5.11.mga/pykolab/setup/setup_mta.py	2013-02-07 21:59:09.000000000 -0700
@@ -344,7 +344,7 @@
     if os.path.isfile('/bin/systemctl'):
         subprocess.call(['systemctl', 'restart', 'postfix.service'])
         subprocess.call(['systemctl', 'restart', 'amavisd.service'])
-        subprocess.call(['systemctl', 'restart', 'clamd.amavisd.service'])
+        subprocess.call(['systemctl', 'restart', 'clamd.service'])
         subprocess.call(['systemctl', 'restart', 'wallace.service'])
     elif os.path.isfile('/sbin/service'):
         subprocess.call(['service', 'postfix', 'restart'])
@@ -362,7 +362,7 @@
     if os.path.isfile('/bin/systemctl'):
         subprocess.call(['systemctl', 'enable', 'postfix.service'])
         subprocess.call(['systemctl', 'enable', 'amavisd.service'])
-        subprocess.call(['systemctl', 'enable', 'clamd.amavisd.service'])
+        subprocess.call(['systemctl', 'enable', 'clamd.service'])
         subprocess.call(['systemctl', 'enable', 'wallace.service'])
     elif os.path.isfile('/sbin/chkconfig'):
         subprocess.call(['chkconfig', 'postfix', 'on'])
diff -ur pykolab-0.5.11/share/templates/imapd.conf.tpl pykolab-0.5.11.mga/share/templates/imapd.conf.tpl
--- pykolab-0.5.11/share/templates/imapd.conf.tpl	2013-01-09 07:03:35.000000000 -0700
+++ pykolab-0.5.11.mga/share/templates/imapd.conf.tpl	2013-02-07 22:03:12.000000000 -0700
@@ -6,9 +6,9 @@
 sasl_pwcheck_method: auxprop saslauthd
 sasl_mech_list: PLAIN LOGIN
 allowplaintext: no
-tls_cert_file: /etc/pki/cyrus-imapd/cyrus-imapd.pem
-tls_key_file: /etc/pki/cyrus-imapd/cyrus-imapd.pem
-tls_ca_file: /etc/pki/tls/certs/ca-bundle.crt
+tls_cert_file: /etc/pki/tls/certs/cyrus-imapd.pem
+tls_key_file: /etc/pki/tls/private/cyrus-imapd.pem
+tls_ca_file: /etc/pki/tls/certs/cyrus-imapd.pem
 # uncomment this if you're operating in a DSCP environment (RFC-4594)
 # qosmarking: af13
 auth_mech: pts