diff --git a/doc/html/header.txt b/doc/html/header.txt
index 49a74abc5e30dd1da276b3f5e7a8bbe6d24f783c..097af4411c7c4a2c19dd0511fd4d1381be0d06de 100644
--- a/doc/html/header.txt
+++ b/doc/html/header.txt
@@ -14,7 +14,7 @@ Linux clusters, high-performance computing, Livermore Computing">
 <meta name="description" content="Simple Linux Utility for Resource Management">
 <meta name="copyright"
 content="This document is copyrighted U.S.
-Department of Energy under Contract W-7405-Eng-48">
+Department of Energy under Contract DE-AC52-07NA27344">
 <meta name="Author" content="Morris Jette">
 <meta name="email" content="jette1@llnl.gov">
 <meta name="Classification"
diff --git a/src/plugins/sched/wiki2/event.c b/src/plugins/sched/wiki2/event.c
index e56f7832dcfe05552a133c7ad7cec25e496b6718..f3795d2d5e3fc1d86c01c5672031429ddce4afa8 100644
--- a/src/plugins/sched/wiki2/event.c
+++ b/src/plugins/sched/wiki2/event.c
@@ -110,7 +110,9 @@ extern int	event_notify(int event_code, char *desc)
 	time_t now = time(NULL);
 	int rc = 0, retry = 2;
 	char *event_msg;
+	DEF_TIMERS;
 
+	START_TIMER;
 	if (e_port == 0) {
 		/* Event notification disabled */
 		return 0;
@@ -169,6 +171,7 @@ extern int	event_notify(int event_code, char *desc)
 		}
 	}
 	pthread_mutex_unlock(&event_mutex);
+	END_TIMER2("event_notify");
 
 	return rc;
 }
diff --git a/src/plugins/sched/wiki2/msg.c b/src/plugins/sched/wiki2/msg.c
index ff3f6a1a36db6a93e969fe0805030f46fac86db7..7e106579f655f04c656dca376d35782a262081a5 100644
--- a/src/plugins/sched/wiki2/msg.c
+++ b/src/plugins/sched/wiki2/msg.c
@@ -539,12 +539,14 @@ static int	_parse_msg(char *msg, char **req)
 \*****************************************************************************/
 static void	_proc_msg(slurm_fd new_fd, char *msg)
 {
-	char *req, *cmd_ptr;
+	DEF_TIMERS;
+	char *req, *cmd_ptr, *msg_type = NULL;
 	char response[128];
 
 	if (new_fd < 0)
 		return;
 
+	START_TIMER;
 	if (!msg) {
 		err_code = -300;
 		err_msg = "NULL request message";
@@ -565,40 +567,55 @@ static void	_proc_msg(slurm_fd new_fd, char *msg)
 	cmd_ptr +=4;
 	err_code = 0;
 	if        (strncmp(cmd_ptr, "GETJOBS", 7) == 0) {
+		msg_type = "wiki:GETJOBS";
 		if (!get_jobs(cmd_ptr, &err_code, &err_msg))
 			goto free_resp_msg;
 	} else if (strncmp(cmd_ptr, "GETNODES", 8) == 0) {
+		msg_type = "wiki:GETNODES";
 		if (!get_nodes(cmd_ptr, &err_code, &err_msg))
 			goto free_resp_msg;
 	} else if (strncmp(cmd_ptr, "STARTJOB", 8) == 0) {
+		msg_type = "wiki:STARTJOB";
 		start_job(cmd_ptr, &err_code, &err_msg);
 	} else if (strncmp(cmd_ptr, "CANCELJOB", 9) == 0) {
+		msg_type = "wiki:CANCELJOB";
 		cancel_job(cmd_ptr, &err_code, &err_msg);
 	} else if (strncmp(cmd_ptr, "REQUEUEJOB", 10) == 0) {
+		msg_type = "wiki:REQUEUEJOB";
 		job_requeue_wiki(cmd_ptr, &err_code, &err_msg);
 	} else if (strncmp(cmd_ptr, "SUSPENDJOB", 10) == 0) {
+		msg_type = "wiki:SUSPENDJOB";
 		suspend_job(cmd_ptr, &err_code, &err_msg);
 	} else if (strncmp(cmd_ptr, "RESUMEJOB", 9) == 0) {
+		msg_type = "wiki:RESUMEJOB";
 		resume_job(cmd_ptr, &err_code, &err_msg);
 	} else if (strncmp(cmd_ptr, "JOBADDTASK", 10) == 0) {
+		msg_type = "wiki:JOBADDTASK";
 		job_add_task(cmd_ptr, &err_code, &err_msg);
 	} else if (strncmp(cmd_ptr, "JOBRELEASETASK", 14) == 0) {
+		msg_type = "wiki:JOBRELEASETASK";
 		job_release_task(cmd_ptr, &err_code, &err_msg);
 	} else if (strncmp(cmd_ptr, "JOBWILLRUN", 10) == 0) {
+		msg_type = "wiki:JOBWILLRUN";
 		job_will_run(cmd_ptr, &err_code, &err_msg);
 	} else if (strncmp(cmd_ptr, "MODIFYJOB", 9) == 0) {
+		msg_type = "wiki:MODIFYJOB";
 		job_modify_wiki(cmd_ptr, &err_code, &err_msg);
 	} else if (strncmp(cmd_ptr, "NOTIFYJOB", 9) == 0) {
+		msg_type = "wiki:NOTIFYJOB";
 		job_notify_wiki(cmd_ptr, &err_code, &err_msg);
 	} else if (strncmp(cmd_ptr, "SIGNALJOB", 9) == 0) {
+		msg_type = "wiki:SIGNALJOB";
 		job_signal_wiki(cmd_ptr, &err_code, &err_msg);
 	} else if (strncmp(cmd_ptr, "INITIALIZE", 10) == 0) {
+		msg_type = "wiki:INITIALIZE";
 		initialize_wiki(cmd_ptr, &err_code, &err_msg);
 	} else {
 		err_code = -300;
 		err_msg = "unsupported request type";
 		error("wiki: unrecognized request type: %s", req);
 	}
+	END_TIMER2(msg_type);
 
  resp_msg:
 	snprintf(response, sizeof(response),