diff --git a/src/protocols/ssh/client.c b/src/protocols/ssh/client.c
index f294363d..813857dd 100644
--- a/src/protocols/ssh/client.c
+++ b/src/protocols/ssh/client.c
@@ -58,6 +58,9 @@ const char* GUAC_CLIENT_ARGS[] = {
 #endif
     "color-scheme",
     "command",
+    "typescript-path",
+    "typescript-name",
+    "create-typescript-path",
     NULL
 };
 
@@ -129,6 +132,25 @@ enum __SSH_ARGS_IDX {
      */
     IDX_COMMAND,
 
+    /**
+     * The full absolute path to the directory in which typescripts should be
+     * written.
+     */
+    IDX_TYPESCRIPT_PATH,
+
+    /**
+     * The name that should be given to typescripts which are written in the
+     * given path. Each typescript will consist of two files: "NAME" and
+     * "NAME.timing".
+     */
+    IDX_TYPESCRIPT_NAME,
+
+    /**
+     * Whether the specified typescript path should automatically be created
+     * if it does not yet exist.
+     */
+    IDX_CREATE_TYPESCRIPT_PATH,
+
     SSH_ARGS_COUNT
 };
 
diff --git a/src/protocols/telnet/client.c b/src/protocols/telnet/client.c
index dab2bdab..9bdb6912 100644
--- a/src/protocols/telnet/client.c
+++ b/src/protocols/telnet/client.c
@@ -54,6 +54,9 @@ const char* GUAC_CLIENT_ARGS[] = {
     "font-name",
     "font-size",
     "color-scheme",
+    "typescript-path",
+    "typescript-name",
+    "create-typescript-path",
     NULL
 };
 
@@ -109,6 +112,25 @@ enum __TELNET_ARGS_IDX {
      */
     IDX_COLOR_SCHEME,
 
+    /**
+     * The full absolute path to the directory in which typescripts should be
+     * written.
+     */
+    IDX_TYPESCRIPT_PATH,
+
+    /**
+     * The name that should be given to typescripts which are written in the
+     * given path. Each typescript will consist of two files: "NAME" and
+     * "NAME.timing".
+     */
+    IDX_TYPESCRIPT_NAME,
+
+    /**
+     * Whether the specified typescript path should automatically be created
+     * if it does not yet exist.
+     */
+    IDX_CREATE_TYPESCRIPT_PATH,
+
     TELNET_ARGS_COUNT
 };