diff --git a/Changes b/Changes
index f4d52c2b1..760152323 100644
--- a/Changes
+++ b/Changes
@@ -1590,3 +1590,4 @@ MOTDs
   allows cloakkey 1 and 3 to be identical. 
 - #0003146 reported by vonitsanet, regarding Modes O,S (etc) not rejected for modes-on-connect 
   fixed by djGrrr
+- #0003289 suggested and patched by fbi, adding (Ping timeout: 182 seconds)
diff --git a/src/ircd.c b/src/ircd.c
index 7567216a2..98a85548d 100644
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -537,6 +537,7 @@ extern TS check_pings(TS currenttime)
 	int  i = 0;
 	char banbuf[1024];
 	int  ping = 0;
+	char scratch[32];
 
 	for (i = 0; i <= LastSlot; i++)
 	{
@@ -735,7 +736,9 @@ extern TS check_pings(TS currenttime)
 					    cptr->sockhost, currenttime,
 					    cptr->since, ping));
 #endif
-				exit_client(cptr, cptr, &me, "Ping timeout");
+				ircsprintf(scratch, "Ping timeout: %d seconds",
+				    (int)(TStime() - cptr->lasttime));
+				    exit_client(cptr, cptr, &me, scratch);
 				continue;
 
 			}