diff --git a/server/modules/certclient.py b/server/modules/certclient.py
index 85b2c4c..53ddabc 100755
--- a/server/modules/certclient.py
+++ b/server/modules/certclient.py
@@ -94,7 +94,9 @@ script
   chvt 9
 
   KEY="/systemid/$(hostname).%(tag)s.key.pem"
+  KEY_LINK="/systemid/%(tag)s.key.pem"
   CERT="/systemid/$(hostname).%(tag)s.cert.pem"
+  CERT_LINK="/systemid/%(tag)s.cert.pem"
   SUBJECT="$(echo '%(subject)s' | sed s/SYSTEMID/$(hostname)/g)"
 
   if test ! -s "${KEY}"; then
@@ -111,6 +113,9 @@ script
     chmod 0444 "${CERT}"
   fi
 
+  ln -s "${KEY}" "${KEY_LINK}"
+  ln -s "${CERT}" "${CERT_LINK}"
+
   chvt 9
 
   echo