diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 7bd33711d..1fb34fb95 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -1,10 +1,18 @@
+Libdigidocpp library [3.16.0](https://github.com/open-eid/libdigidocpp/releases/tag/v3.16.0) release notes
+--------------------------------------
+- Update libraries and platform support (#530, #477, #534, #535)
+- Improve signature and container compatibility (#528)
+- Other fixes and optimizations (#529, #533, #532, #536)
+- Removed time-mark signature creation support (#527, #539)
+
+[Full Changelog](https://github.com/open-eid/libdigidocpp/compare/v3.15.0...v3.16.0)
+
 Libdigidocpp library [3.15.0](https://github.com/open-eid/libdigidocpp/releases/tag/v3.15.0) release notes
 --------------------------------------
-- Update libraries and platform support (#525, #522, #515, #503, #511, #514, #516, #517, #523, #505, #530, #477)
+- Update libraries and platform support (#525, #522, #515, #503, #511, #514, #516, #517, #523, #505)
 - Improve code quality and documentation (#526, #521, #524, #520, #501)
-- Improve signature and container compatibility (#506, #504, #502, #491, #528)
-- Other fixes and optimizations (#435, #481, #508, #433, #519, #497, #535, #533, #532)
-- Removed time-mark signature creation support (#527, #539)
+- Improve signature and container compatibility (#506, #504, #502, #491)
+- Other fixes and optimizations (#435, #481, #508, #433, #519, #497)
 
 [Full Changelog](https://github.com/open-eid/libdigidocpp/compare/v3.14.11...v3.15.0)
 
diff --git a/src/crypto/OCSP.cpp b/src/crypto/OCSP.cpp
index cb1f0c740..d1902ca4c 100644
--- a/src/crypto/OCSP.cpp
+++ b/src/crypto/OCSP.cpp
@@ -76,12 +76,7 @@ OCSP::OCSP(const X509Cert &cert, const X509Cert &issuer)
     if(!OCSP_request_add0_id(req.get(), certId))
         THROW_OPENSSLEXCEPTION("Failed to add certificate ID to OCSP request.");
 
-    SCOPE(ASN1_OCTET_STRING, st, ASN1_OCTET_STRING_new());
-    ASN1_OCTET_STRING_set(st.get(), nullptr, 20);
-    RAND_bytes(st->data, st->length);
-
-    SCOPE(X509_EXTENSION, ex, X509_EXTENSION_create_by_NID(nullptr, NID_id_pkix_OCSP_Nonce, 0, st.get()));
-    if(!OCSP_REQUEST_add_ext(req.get(), ex.get(), 0))
+    if(!OCSP_request_add1_nonce(req.get(), nullptr, 32)) // rfc8954: SIZE(1..32)
         THROW_OPENSSLEXCEPTION("Failed to add NONCE to OCSP request.");
 
     Connect::Result result = Connect(url, "POST").exec({