diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Change log for "tls"
 
+## Version 2.5.3
+
+* Count milliseconds from the base without overflowing a 32-bit time_t.
+  [#644](https://github.com/haskell-tls/hs-tls/pull/644)
+* Use a generator of no small order in the custom DH prime test.
+  [#646](https://github.com/haskell-tls/hs-tls/pull/646)
+* Encode the test certificates as v3.
+  [#648](https://github.com/haskell-tls/hs-tls/pull/648)
+
 ## Version 2.5.2
 
 * Order key_share as supported_groups.
diff --git a/Network/TLS/Handshake/Common13.hs b/Network/TLS/Handshake/Common13.hs
--- a/Network/TLS/Handshake/Common13.hs
+++ b/Network/TLS/Handshake/Common13.hs
@@ -352,7 +352,9 @@
 
 millisecondsFromBase :: UnixTime -> Millisecond
 millisecondsFromBase (UnixTime (CTime s) us) =
-    fromIntegral ((s - base) * 1000) + fromIntegral (us `div` 1000)
+    -- Multiplied as a Millisecond: time_t has 32 bits on i386, and the
+    -- milliseconds since the base overflow it.
+    fromIntegral (s - base) * 1000 + fromIntegral (us `div` 1000)
   where
     base = 1483228800
 
diff --git a/test/Certificate.hs b/test/Certificate.hs
--- a/test/Certificate.hs
+++ b/test/Certificate.hs
@@ -61,7 +61,7 @@
     let sigalg = getSignatureALG pubKey
     return $
         Certificate
-            { certVersion = 3
+            { certVersion = 2
             , certSerial = serial
             , certSignatureAlg = sigalg
             , certIssuerDN = issuerdn
@@ -80,7 +80,7 @@
 simpleCertificate :: PubKey -> Certificate
 simpleCertificate pubKey =
     Certificate
-        { certVersion = 3
+        { certVersion = 2
         , certSerial = 0
         , certSignatureAlg = getSignatureALG pubKey
         , certIssuerDN = simpleDN
diff --git a/test/HandshakeSpec.hs b/test/HandshakeSpec.hs
--- a/test/HandshakeSpec.hs
+++ b/test/HandshakeSpec.hs
@@ -1542,8 +1542,10 @@
             arbitraryPairParamsWithVersionsAndCiphers
                 ([TLS12], [TLS12])
                 ([cipher], [cipher])
-    let small = DH.Params (2 ^ (1023 :: Int) + 1) 2 1024
-        large = DH.Params (2 ^ (8193 :: Int) + 1) 2 8194
+    -- 2 has the order 2n modulo 2^n + 1, so its public key was 1 or p - 1
+    -- once in about n handshakes.  5 has no such small order.
+    let small = DH.Params (2 ^ (1023 :: Int) + 1) 5 1024
+        large = DH.Params (2 ^ (8193 :: Int) + 1) 5 8194
         params (minBits, maxBits) dh =
             ( clientParam
                 { clientSupported =
diff --git a/tls.cabal b/tls.cabal
--- a/tls.cabal
+++ b/tls.cabal
@@ -1,6 +1,6 @@
 cabal-version:      2.0
 name:               tls
-version:            2.5.2
+version:            2.5.3
 license:            BSD3
 license-file:       LICENSE
 copyright:          Vincent Hanquez <vincent@snarc.org>
