diff -Nur netkit-ntalk-0.17/talk/display.c netkit-ntalk-0.17-timestamp/talk/display.c
--- netkit-ntalk-0.17/talk/display.c	2007-05-15 20:27:36.000000000 +1000
+++ netkit-ntalk-0.17-timestamp/talk/display.c	2007-05-15 20:27:10.000000000 +1000
@@ -478,6 +478,19 @@
 	for (j = 0; j < size; j++) {
 		if (text[j] == '\n' || text[j]=='\r') {
 			display_eol(win);
+
+			const int buffsize = 256;
+			time_t tm;
+			tm = time(NULL);
+			struct tm *ptr;
+			ptr = localtime(&tm);
+			char timestamp[buffsize];	
+			int len = strftime(timestamp, buffsize, "[%T] ", ptr);
+			int i;
+			
+			for(i=0; i<len; i++){
+					display_addch(win, timestamp[i]);
+			}
 		}
 		else if (text[j]=='\b' || 
 			 text[j]==127 || 
diff -Nur netkit-ntalk-0.17/talk/talk.h netkit-ntalk-0.17-timestamp/talk/talk.h
--- netkit-ntalk-0.17/talk/talk.h	2007-05-15 20:27:36.000000000 +1000
+++ netkit-ntalk-0.17-timestamp/talk/talk.h	2007-05-15 20:27:10.000000000 +1000
@@ -37,6 +37,7 @@
 /*#include <curses.h>*/
 #include <sys/socket.h>
 #include <netinet/in.h>
+#include <time.h>
 
 #include "prot_talkd.h"
 
diff -Nur netkit-ntalk-0.17/talkd/announce.c netkit-ntalk-0.17-timestamp/talkd/announce.c
--- netkit-ntalk-0.17/talkd/announce.c	2007-05-15 20:27:36.000000000 +1000
+++ netkit-ntalk-0.17-timestamp/talkd/announce.c	2007-05-15 20:27:10.000000000 +1000
@@ -40,6 +40,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/time.h>
+#include <time.h>
 #include <sys/wait.h>
 #include <sys/socket.h>
 #include <errno.h>
diff -Nur netkit-ntalk-0.17/talkd/table.c netkit-ntalk-0.17-timestamp/talkd/table.c
--- netkit-ntalk-0.17/talkd/table.c	2007-05-15 20:27:36.000000000 +1000
+++ netkit-ntalk-0.17-timestamp/talkd/table.c	2007-05-15 20:27:10.000000000 +1000
@@ -46,7 +46,8 @@
  * Consider this a mis-guided attempt at modularity
  */
 #include <sys/param.h>
-#include <sys/time.h>
+#include <time.h>
+//#include <sys/time.h>
 #include <sys/socket.h>
 #include <syslog.h>
 #include <unistd.h>