diff --git a/docs/README.pod b/docs/README.pod
index 97740a8..9df0df3 100644
--- a/docs/README.pod
+++ b/docs/README.pod
@@ -91,6 +91,10 @@ Change the network packetsize to I<PACKETSIZE>.
 The packetsize should the smaller than the MTU of the network.
 By default a safe value of 1024 is used.
 
+=item B<-remote>
+
+Enable the optimizations for remote connections in GFE.
+
 =item B<-app> [I<APP>]
 
 Change the requested app to execute to I<APP>.
diff --git a/src/config.c b/src/config.c
index 7b054d1..0a00582 100644
--- a/src/config.c
+++ b/src/config.c
@@ -58,6 +58,7 @@ static struct option long_options[] = {
   {"platform", required_argument, 0, 'p'},
   {"save", required_argument, NULL, 'q'},
   {"keydir", required_argument, NULL, 'r'},
+  {"remote", no_argument, NULL, 's'},
   {0, 0, 0, 0},
 };
 
@@ -180,6 +181,9 @@ static void parse_argument(int c, char* value, PCONFIGURATION config) {
   case 'r':
     strcpy(config->key_dir, value);
     break;
+  case 's':
+    config->stream.remote = 1;
+    break;
   case 1:
     if (config->action == NULL)
       config->action = value;
@@ -257,6 +261,7 @@ void config_parse(int argc, char* argv[], PCONFIGURATION config) {
   config->stream.fps = 60;
   config->stream.bitrate = -1;
   config->stream.packetSize = 1024;
+  config->stream.remote = 0;
 
   config->platform = "default";
   config->app = "Steam";
@@ -282,7 +287,7 @@ void config_parse(int argc, char* argv[], PCONFIGURATION config) {
   } else {
     int option_index = 0;
     int c;
-    while ((c = getopt_long_only(argc, argv, "-abc:d:efg:h:i:j:k:lm:no:p:q:", long_options, &option_index)) != -1) {
+    while ((c = getopt_long_only(argc, argv, "-abc:d:efg:h:i:j:k:lm:no:p:q:r:s", long_options, &option_index)) != -1) {
       parse_argument(c, optarg, config);
     }
   }
diff --git a/src/main.c b/src/main.c
index cd6b04d..920c90a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -126,6 +126,7 @@ static void help() {
   printf("\t-60fps\t\t\tUse 60fps [default]\n");
   printf("\t-bitrate <bitrate>\tSpecify the bitrate in Kbps\n");
   printf("\t-packetsize <size>\tSpecify the maximum packetsize in bytes\n");
+  printf("\t-remote\t\t\tEnable remote optimizations\n");
   printf("\t-app <app>\t\tName of app to stream\n");
   printf("\t-nosops\t\t\tDon't allow GFE to modify game settings\n");
   printf("\t-localaudio\t\tPlay audio locally\n");
diff --git a/third_party/moonlight-common-c b/third_party/moonlight-common-c
index 7500382..4d9cbd3 160000
--- a/third_party/moonlight-common-c
+++ b/third_party/moonlight-common-c
@@ -1 +1 @@
-Subproject commit 7500382c2653eeb44068817d0a43c1d946410918
+Subproject commit 4d9cbd3c3dbbd03aebc3bba1e3ea841f6f3dd09f