diff -Nur -x '*.orig' -x '*.rej' phpki/phpki-0.82/search.php mezzanine_patched_phpki/phpki-0.82/search.php
--- phpki/phpki-0.82/search.php	2005-11-16 00:54:37.000000000 +0100
+++ mezzanine_patched_phpki/phpki-0.82/search.php	2009-01-07 11:42:58.000000000 +0100
@@ -36,7 +36,12 @@
 
 case 'download':
 	$rec = CAdb_get_entry($serial);
-	upload("$config[cert_dir]/$serial.der", "$rec[common_name] ($rec[email]).cer", 'application/pkix-cert');
+	upload("$config[cert_dir]/$serial.der", "$rec[common_name].cer", 'application/pkix-cert');
+        break;
+
+case 'download_pem':
+        $rec = CAdb_get_entry($serial);
+        upload("$config[new_certs_dir]/$serial.pem", "$rec[common_name].pem", 'application/pkix-cert');
         break;
 
 case search:
@@ -97,6 +102,7 @@
 		if ($rec['status'] != 'Revoked') {
 			?>
 			<a href=<?=$PHP_SELF?>?stage=download&serial=<?=htvar($rec['serial'])?>><img src=images/download.png alt="Download" title="Download the certificate so that you may send encrypted e-mail"></a>
+			<a href=<?=$PHP_SELF?>?stage=download_pem&serial=<?=htvar($rec['serial'])?>><img src=images/download.png alt="Download (in PEM format)" title="Download in PEM format"></a>
 			<?
 		}
 		print '</td></tr>';