diff --git a/tmate-master.c b/tmate-master.c
index cb753cc5..1fb64f4f 100644
--- a/tmate-master.c
+++ b/tmate-master.c
@@ -5,6 +5,10 @@
 #include "tmate.h"
 #include "tmate-protocol.h"
 
+#define CONTROL_PROTOCOL_VERSION 1
+
+#define pack(what, ...) _pack(&tmate_session->master_encoder, what, __VA_ARGS__)
+
 static void ctl_daemon_fwd_msg(struct tmate_session *session,
 			       struct tmate_unpacker *uk)
 {
@@ -13,6 +17,33 @@ static void ctl_daemon_fwd_msg(struct tmate_session *session,
 	tmate_send_mc_obj(&uk->argv[0]);
 }
 
+static void ctl_daemon_request_snapshot(struct tmate_session *session,
+					struct tmate_unpacker *uk)
+{
+	pack(array, 2);
+	pack(int, TMATE_CTL_SNAPSHOT);
+	pack(array, 1);
+	pack(string, "snapshot TODO");
+}
+
+static void ctl_pane_keys(struct tmate_session *session,
+			  struct tmate_unpacker *uk)
+{
+	int i;
+	int pane_id;
+	char *str;
+
+	pane_id = unpack_int(uk);
+	str = unpack_string(uk);
+
+	/* a new protocol might be useful :) */
+	/* TODO Make pane_id active! the pane_id arg is ignored! */
+	for (i = 0; str[i]; i++)
+		tmate_client_pane_key(pane_id, str[i]);
+
+	free(str);
+}
+
 void tmate_dispatch_master_message(struct tmate_session *session,
 				   struct tmate_unpacker *uk)
 {
@@ -20,12 +51,12 @@ void tmate_dispatch_master_message(struct tmate_session *session,
 	switch (cmd) {
 #define dispatch(c, f) case c: f(session, uk); break
 	dispatch(TMATE_CTL_DEAMON_FWD_MSG,	ctl_daemon_fwd_msg);
+	dispatch(TMATE_CTL_REQUEST_SNAPSHOT,	ctl_daemon_request_snapshot);
+	dispatch(TMATE_CTL_PANE_KEYS,		ctl_pane_keys);
 	default: tmate_fatal("Bad master message type: %d", cmd);
 	}
 }
 
-#define pack(what, ...) _pack(&tmate_session->master_encoder, what, __VA_ARGS__)
-
 void tmate_send_master_daemon_msg(struct tmate_session *session,
 				  struct tmate_unpacker *uk)
 {
diff --git a/tmate-protocol.h b/tmate-protocol.h
index 21b74c67..7e51ab10 100644
--- a/tmate-protocol.h
+++ b/tmate-protocol.h
@@ -4,17 +4,18 @@
  /* 17 and not 16 because the sender does not takes into account envelope size */
 #define TMATE_MAX_MESSAGE_SIZE (17*1024)
 
-#define CONTROL_PROTOCOL_VERSION 1
-
 /* TODO document each msg */
 
 enum tmate_control_out_msg_types {
 	TMATE_CTL_AUTH,
 	TMATE_CTL_DEAMON_OUT_MSG,
+	TMATE_CTL_SNAPSHOT,
 };
 
 enum tmate_control_in_msg_types {
 	TMATE_CTL_DEAMON_FWD_MSG,
+	TMATE_CTL_REQUEST_SNAPSHOT,
+	TMATE_CTL_PANE_KEYS,
 };
 
 enum tmate_daemon_out_msg_types {