diff --git a/src/freedombone-clientcert b/src/freedombone-clientcert
index cd52d621..176698db 100755
--- a/src/freedombone-clientcert
+++ b/src/freedombone-clientcert
@@ -133,13 +133,13 @@ fi
 # move the cert to the user's home
 mkdir /home/$USERNAME/emailcert
 mv /etc/ssl/certs/$USERNAME.cer /home/$USERNAME/emailcert
-cp /etc/ssl/certs/dovecot-ca.crt /home/$USERNAME/emailcert
+cp /etc/ssl/certs/ca-$HOSTNAME.crt /home/$USERNAME/emailcert
 mv /etc/ssl/private/$USERNAME.key /home/$USERNAME/emailcert
 mv /etc/ssl/certs/$USERNAME.crt /home/$USERNAME/emailcert
 openssl pkcs12 -export -in /home/$USERNAME/emailcert/$USERNAME.cer \
         -out /home/$USERNAME/emailcert/$USERNAME.p12 \
         -inkey /home/$USERNAME/emailcert/$USERNAME.key \
-        -certfile /home/$USERNAME/emailcert/dovecot-ca.crt \
+        -certfile /home/$USERNAME/emailcert/ca-$HOSTNAME.crt \
         -password pass:""
 
 # make an install script