--- manager.c	2004-04-25 18:17:23.000000000 +0000
+++ manager.c.new	2004-04-25 18:17:06.000000000 +0000
@@ -467,11 +467,16 @@
 static int action_command(struct mansession *s, struct message *m)
 {
 	char *cmd = astman_get_header(m, "Command");
+	char *id = astman_get_header(m,"ActionID");
+	char idText[256] = "";
+        if (id && strlen(id))
+                snprintf(idText,256,"ActionID: %s\r\n",id);
+
 	ast_mutex_lock(&s->lock);
 	s->blocking = 1;
 	ast_mutex_unlock(&s->lock);
 	ast_cli(s->fd, "Response: Follows\r\n");
-	/* FIXME: Wedge a ActionID response in here, waiting for later changes */
+	ast_cli(s->fd, idText);
 	ast_cli_command(s->fd, cmd);
 	ast_cli(s->fd, "--END COMMAND--\r\n\r\n");
 	ast_mutex_lock(&s->lock);