diff --git a/share/pgpkeys/oleg.key b/share/pgpkeys/oleg.key
index ce8319947a..7d4000814c 100644
--- a/share/pgpkeys/oleg.key
+++ b/share/pgpkeys/oleg.key
@@ -1,13 +1,20 @@
 <!-- $FreeBSD$ -->
 <!--
-sh addkey.sh oleg 78CE105F;
+sh addkey.sh oleg AF22DCEF78CE105F A50DF9830DEFB187 ;
 -->
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
-pub   1024D/78CE105F 2004-02-06
+pub   dsa1024/AF22DCEF78CE105F 2004-02-06 [SC] [expires: 2017-01-01]
       Key fingerprint = 98CC 3E66 26DE 50A8 DBC4  EB27 AF22 DCEF 78CE 105F
-uid                  Oleg Bulyzhin <oleg@FreeBSD.org>
-uid                  Oleg Bulyzhin <oleg@rinet.ru>
-sub   1024g/F747C159 2004-02-06
+uid                            Oleg Bulyzhin <oleg@rinet.ru>
+uid                            Oleg Bulyzhin <oleg@FreeBSD.org>
+sub   elg1024/7644AEB2F747C159 2004-02-06 [E] [expires: 2017-01-01]
+
+pub   ed25519/A50DF9830DEFB187 2016-08-23 [SC] [expires: 2020-02-01]
+      Key fingerprint = 54DC 8880 4B98 73C4 18C3  6926 A50D F983 0DEF B187
+uid                            Oleg Bulyzhin <oleg@FreeBSD.org>
+uid                            Oleg Bulyzhin <oleg@rinet.ru>
+sub   cv25519/ECDE4D1D477AC498 2016-08-23 [E] [expires: 2020-02-01]
+
 ]]></programlisting>
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
@@ -21,22 +28,31 @@ nhFg7Bca74t6vnn5Q4miLnDDyOPkZqMBD2nLUkcK/kMfe5uqDUWf/i6sFDwv7d6I
 KQHSA/9eTg26Ihn9uBpGit+slgkmTHmKgAbg7IaSHSEYRbpmnc0Je794zeWns/oI
 vAyGNxEFpPQMVrSXHnFmK9AOcLcfssE24a3zw7So33asH2Ha9yYBrfKGrTCPZAsa
 uUGrKbGmXQ0oXDjjqV4anvC2QI5pEJvMbHJ+Xyq5xQN73ttJxrQdT2xlZyBCdWx5
-emhpbiA8b2xlZ0ByaW5ldC5ydT6IXgQTEQIAHgUCQCOcNgIbAwYLCQgHAwIDFQID
-AxYCAQIeAQIXgAAKCRCvItzveM4QXzXVAJ9RD4kKNcvV8UmuBM66osVfZ/7yIwCg
-htVf/ZfKdcob1zQsBNNpmzkpduKIRgQTEQIABgUCQCOgsQAKCRD9LjUgMMgeateB
-AKC0iX0NNspa5EnBYGE/eEe+LxRs6ACfUqA0s50e2goJznaIcLTgZXtDECGIRgQT
-EQIABgUCQDIZWwAKCRCF1FBFa2kbA7N9AKCbDyp3g6vRN7dQKBb35s7gLp8yIwCd
-EH/ivmrxZSaHlrOMJjt6rnmuFqa0IE9sZWcgQnVseXpoaW4gPG9sZWdARnJlZUJT
-RC5vcmc+iGAEExECACAFAkOMPS0CGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAK
-CRCvItzveM4QX+tfAKCLk3zeTyzbbN6TqYpnqocno4H9kACePQaaDytLX+zk4plw
-sywqPLv67SG5AQ0EQCOcNxAEAIUR6Uj/bLAu0/FSGDSCXfjuThVT1lh1rCLQkbBw
-TxNiwHPHHSQRa654aoYbQdi9x6M7fzE6Uzmdj1Gs/UBYZhhsrlkL+Ls/xuhe3Kh3
-E6lho11qPhjYXmFHk42VhtVlOcikZ/Azgqgycfql81H3bKWv6jA0el9SnX4yk5qf
-tgZTAAMFA/9T7/ty76bNeP3/LcY9ZL9KYWB8v8pJ9jEt/RfBXB0GTuV/H+bzTjSc
-PwhT8Fam9Fo+r02tUJfqA+XlOJf6IXPlLPRfvzHhiBJSBPuMvB6vYs5zrlUzkgNE
-VFHBr+TxpUWBq4ZtI9K8YUbPD+s86irYn9fHlnj9qnYsod3ySvU0xYhJBBgRAgAJ
-BQJAI5w3AhsMAAoJEK8i3O94zhBfFzAAnAg+W9rkVVdYu33hNqpX8E1t2kShAJwK
-V8DuSaXJtEgVE7Wp5CeArqtwUg==
-=/2pb
+emhpbiA8b2xlZ0ByaW5ldC5ydT6IZAQTEQIAJAIbAwYLCQgHAwIDFQIDAxYCAQIe
+AQIXgAUCV72ylwUJGESqWAAKCRCvItzveM4QX2SzAJsG9gfr1XW3zc+F57qXKh5d
+HS/MKACfcoW/s0eLsWIEryK4/VzsfRh+6Qe0IE9sZWcgQnVseXpoaW4gPG9sZWdA
+RnJlZUJTRC5vcmc+iGYEExECACYCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAUC
+V72yiwUJGESqWAAKCRCvItzveM4QX/INAJ9b9z2JxW8k/s2ygdhMIgcbyQRavgCg
+isUjNoVWDqoyuoLW1/P02TYTYd25AQ0EQCOcNxAEAIUR6Uj/bLAu0/FSGDSCXfju
+ThVT1lh1rCLQkbBwTxNiwHPHHSQRa654aoYbQdi9x6M7fzE6Uzmdj1Gs/UBYZhhs
+rlkL+Ls/xuhe3Kh3E6lho11qPhjYXmFHk42VhtVlOcikZ/Azgqgycfql81H3bKWv
+6jA0el9SnX4yk5qftgZTAAMFA/9T7/ty76bNeP3/LcY9ZL9KYWB8v8pJ9jEt/RfB
+XB0GTuV/H+bzTjScPwhT8Fam9Fo+r02tUJfqA+XlOJf6IXPlLPRfvzHhiBJSBPuM
+vB6vYs5zrlUzkgNEVFHBr+TxpUWBq4ZtI9K8YUbPD+s86irYn9fHlnj9qnYsod3y
+SvU0xYhPBBgRAgAPAhsMBQJXvbKyBQkYRKpNAAoJEK8i3O94zhBfARYAoItcOGTj
+YxbT9IRtrLAKyUVdscrtAJ9jDDhAK7f0V0rmHY4tcot66gjZYJgzBFe8Fu0WCSsG
+AQQB2kcPAQEHQEAbKRx2+FxeKjl+yWwTxqvbMFfa5GkpmOEw2vd9uF9QtCBPbGVn
+IEJ1bHl6aGluIDxvbGVnQEZyZWVCU0Qub3JnPoiCBBMWCAAqAhsDAh4BAheAAhkB
+BQsJCAcDBRUKCQgLBRYDAgEABQJXvbRxBQkGeKiUAAoJEKUN+YMN77GHrCwA/i9h
+mP8ujCTGfEj9Wqc5QjJ6S4ksGxlQJISamoIdfl06AQDS36lSjabbem5H5yL5QjQc
+dA4uxBXinY366Gt4VDDzDbQdT2xlZyBCdWx5emhpbiA8b2xlZ0ByaW5ldC5ydT6I
+fwQTFggAJwIbAwULCQgHAgYVCAkKCwIEFgIDAQIeAQIXgAUCV720cQUJBniolAAK
+CRClDfmDDe+xh6bgAQCyVV8ZVXKDB2vXz6k508VtMfpLDE6IXIA5OtRfFCERwwD/
+UQWUZgJafVQ6X1boJYmeVKkpWjWIS78pCHd0swCfFwW4OARXvBbtEgorBgEEAZdV
+AQUBAQdAwtt+fqoayY5SKPrlEARZrzCK244Oyc0v60ROeY3EVwcDAQgHiGcEGBYI
+AA8CGwwFAle9tGQFCQZ4qJUACgkQpQ35gw3vsYc6BQD+I3HUvDKO52aM9/EYSco9
+ZHFWtR4Z/7Sc8uxdYAdBqeQBANVXFpRCp8OItsIe6nH7e8Z/QY04UMCbwSIxMCxK
+gLoH
+=knjF
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>