diff --git a/man/man5/tlshd.conf.5 b/man/man5/tlshd.conf.5
index 94981b4..796c634 100644
--- a/man/man5/tlshd.conf.5
+++ b/man/man5/tlshd.conf.5
@@ -18,7 +18,7 @@
 .\" tlshd.conf(5)
 .\"
 .\" Copyright (c) 2022 Oracle and/or its affiliates.
-.TH tlshd.conf 5 "$(date +'%B %Y')"
+.TH tlshd.conf 5 "23 Sep 2025"
 .SH NAME
 tlshd.conf \- tlshd configuration file
 .SH SYNOPSIS
diff --git a/src/tlshd/handshake.c b/src/tlshd/handshake.c
index 5a28939..f688932 100644
--- a/src/tlshd/handshake.c
+++ b/src/tlshd/handshake.c
@@ -97,12 +97,12 @@ void tlshd_start_tls_handshake(gnutls_session_t session,
 		case GNUTLS_E_CERTIFICATE_VERIFICATION_ERROR:
 			tlshd_log_cert_verification_error(session);
 			break;
-		case -ETIMEDOUT:
-			tlshd_log_gnutls_error(ret);
-			parms->session_status = -ret;
+		case GNUTLS_E_PREMATURE_TERMINATION:
+			tlshd_log_error("Handshake timeout, retrying");
+			parms->session_status = ETIMEDOUT;
 			break;
 		default:
-			tlshd_log_notice("tlshd_start_tls_handshake unhandled error %d, returning EACCES\n", ret);
+			tlshd_log_gnutls_error(ret);
 		}
 		return;
 	}