diff --git a/src/fe-common/irc/fe-ctcp.c b/src/fe-common/irc/fe-ctcp.c
index c73399be..2841c1b9 100644
--- a/src/fe-common/irc/fe-ctcp.c
+++ b/src/fe-common/irc/fe-ctcp.c
@@ -124,18 +124,18 @@ static void ctcp_ping_reply(IRC_SERVER_REC *server, const char *data,
 			    const char *target)
 {
 	gint64 tv, tv2;
-	long usecs;
+	long usecs, secs;
 
 	g_return_if_fail(data != NULL);
 
-	if (sscanf(data, "%ld %ld", &tv, &tv2) < 1) {
+	if (sscanf(data, "%ld %ld", &secs, &usecs) < 1) {
 		char *tmp = g_strconcat("PING ", data, NULL);
 		ctcp_default_reply(server, tmp, nick, addr, target);
 		g_free(tmp);
 		return;
 	}
 
-	tv2 += tv * G_TIME_SPAN_SECOND;
+	tv2 = secs * G_TIME_SPAN_SECOND + usecs;
 	tv = g_get_real_time();
 	usecs = tv - tv2;
 	printformat(server, server_ischannel(SERVER(server), target) ? target : nick, MSGLEVEL_CTCPS,
diff --git a/src/irc/core/irc-commands.c b/src/irc/core/irc-commands.c
index f6c25641..fb482212 100644
--- a/src/irc/core/irc-commands.c
+++ b/src/irc/core/irc-commands.c
@@ -541,7 +541,8 @@ static void cmd_ping(const char *data, IRC_SERVER_REC *server, WI_ITEM_REC *item
 
 	tv = g_get_real_time();
 
-	str = g_strdup_printf("%s PING %ld %ld", data, tv / G_TIME_SPAN_SECOND, tv % G_TIME_SPAN_SECOND);
+	str = g_strdup_printf("%s PING %ld %ld", data, (long) (tv / G_TIME_SPAN_SECOND),
+	                      (long) (tv % G_TIME_SPAN_SECOND));
 	signal_emit("command ctcp", 3, str, server, item);
 	g_free(str);
 }