diff -Naur nagios-1.2.orig/cgi/status.c nagios-1.2/cgi/status.c
--- nagios-1.2.orig/cgi/status.c	2003-11-22 17:37:22.000000000 -0800
+++ nagios-1.2/cgi/status.c	2004-07-28 15:12:12.000000000 -0700
@@ -61,6 +61,7 @@
 extern service *service_list;
 extern host *host_list;
 
+extern comment *comment_list;
 
 #define MAX_MESSAGE_BUFFER		4096
 
@@ -1026,6 +1027,8 @@
 	int seconds;
 	int duration_error=FALSE;
 	int total_entries=0;
+	comment *temp_comment;
+	comment *last_comment;
 
 
 	/* sort the service list if necessary */
@@ -1134,6 +1137,9 @@
 		temp_url[sizeof(temp_url)-1]='\x0';
 	        }
 
+	/* load the comment data */
+	read_comment_data(DEFAULT_CGI_CONFIG_FILE);
+
 	/* the main list of services */
 	printf("<TABLE BORDER=0 width=100%% CLASS='status'>\n");
 	printf("<TR>\n");
@@ -1502,6 +1508,28 @@
 
 			printf("</TR>\n");
 
+			/* last comment if this service has been acknowledged */
+			if(temp_status->problem_has_been_acknowledged==TRUE){
+				/* check all the comments to see if they apply to this host or service */
+				for(temp_comment=comment_list;temp_comment!=NULL;temp_comment=temp_comment->next){
+					if(temp_comment->comment_type==SERVICE_COMMENT && !strcmp(temp_comment->host_name,temp_status->host_name) && !strcmp(temp_comment->service_description,temp_status->description))
+						last_comment = temp_comment;
+					}
+				
+				/* now print the comment */
+				if(last_comment) {
+					printf("<TR>\n");
+					printf("<td></td>\n");
+					printf("<td colspan=6 class='comment'>\n");
+					
+					get_time_string(&last_comment->entry_time,date_time,(int)sizeof(date_time),SHORT_DATE_TIME);
+					printf("<b>%s</b> - %s - %s\n", last_comment->comment_data, last_comment->author, date_time);
+					
+					printf("</td>\n");
+					printf("</TR>\n");
+					}
+				}
+
 			last_host=temp_status->host_name;
 		        }
 
@@ -1559,6 +1587,8 @@
 	int seconds;
 	int duration_error=FALSE;
 	int total_entries=0;
+	comment *temp_comment;
+	comment *last_comment;
 
 
 	/* sort the host list if necessary */
@@ -1637,6 +1667,8 @@
 		temp_url[sizeof(temp_url)-1]='\x0';
 	        }
 
+	/* load the comment data */
+	read_comment_data(DEFAULT_CGI_CONFIG_FILE);
 
 	/* the main list of hosts */
 	printf("<DIV ALIGN='center'>\n");
@@ -1854,6 +1886,27 @@
 			printf("<TD CLASS='status%s'>%s&nbsp;</TD>\n",status_bg_class,temp_status->information);
 
 			printf("</TR>\n");
+
+			/* last comment if this host has been acknowledged */
+			if(temp_status->problem_has_been_acknowledged==TRUE){
+				/* check all the comments to see if they apply to this host or service */
+				for(temp_comment=comment_list;temp_comment!=NULL;temp_comment=temp_comment->next){
+					if(temp_comment->comment_type==HOST_COMMENT && !strcmp(temp_comment->host_name,temp_status->host_name))
+						last_comment = temp_comment;
+					}
+				
+				/* now print the comment */
+				if(last_comment) {
+					printf("<TR>\n");
+					printf("<td colspan=5 class='comment'>\n");
+					
+					get_time_string(&last_comment->entry_time,date_time,(int)sizeof(date_time),SHORT_DATE_TIME);
+					printf("<b>%s</b> - %s - %s\n", last_comment->comment_data, last_comment->author, date_time);
+					
+					printf("</td>\n");
+					printf("</TR>\n");
+					}
+				}
 		        }
 
 	        }