diff --git a/lib/modules/Standards.pmod/X509.pmod b/lib/modules/Standards.pmod/X509.pmod
index ddb0af11b47ab570f9345871eb69d385950a299a..0c0d548066c0b7726b0538d1b41faa7e5cce8f98 100644
--- a/lib/modules/Standards.pmod/X509.pmod
+++ b/lib/modules/Standards.pmod/X509.pmod
@@ -365,6 +365,10 @@ protected Verifier make_verifier(Object _keyinfo)
 }
 
 //! Represents a TBSCertificate.
+//!
+//! @note
+//!   Was not compatible with @[Standards.ASN1.Types.Sequence]
+//!   Prior to Pike 8.0.
 class TBSCertificate
 {
   inherit Sequence;
@@ -455,6 +459,17 @@ class TBSCertificate
     return low_get(2);
   }
 
+  //!
+  void `validity=(Sequence v)
+  {
+    // FIXME: Validate?
+    low_set(3, v);
+  }
+  Sequence `validity()
+  {
+    return low_get(3);
+  }
+
   //!
   void `not_before=(int t)
   {
@@ -493,6 +508,17 @@ class TBSCertificate
 
   protected Verifier internal_public_key;
 
+  //!
+  void `keyinfo=(Sequence ki)
+  {
+    internal_public_key = make_verifier(ki);
+    low_set(5, ki);
+  }
+  Sequence `keyinfo()
+  {
+    return low_get(5);
+  }
+
   //!
   void `public_key=(Verifier v)
   {