diff --git a/docs/ssnes.1 b/docs/ssnes.1
index 4e7733936d..9d27fdf7ee 100644
--- a/docs/ssnes.1
+++ b/docs/ssnes.1
@@ -122,5 +122,9 @@ Connect to a host of netplay. Will always assume player 2.
 Sync frames to use when using netplay. More frames allow for more latency, but requires more CPU power.
 Set FRAMES to 0 to have perfect sync. 0 frames is only suitable for LAN. Defaults to 0.
 
+.TP
+\fB--port PORT\fR
+Network port used for netplay. This defaults to 55435. This option affects both TCP and UDP.
+
 .SH "SEE ALSO"
 \fBssnes-joyconfig\fR(1)
diff --git a/general.h b/general.h
index 3a3f40c666..fe6abd0822 100644
--- a/general.h
+++ b/general.h
@@ -184,6 +184,7 @@ struct global
    bool netplay_enable;
    bool netplay_is_client;
    unsigned netplay_sync_frames;
+   uint16_t netplay_port;
 
 #ifdef HAVE_FFMPEG
    ffemu_t *rec;
diff --git a/netplay.c b/netplay.c
index a10ffe4c61..0b6ef01abd 100644
--- a/netplay.c
+++ b/netplay.c
@@ -507,8 +507,9 @@ bool netplay_poll(netplay_t *handle)
    // We skip reading the first frame so the host has a change to grab our host info so we don't block forever :')
    if (handle->frame_count == 0)
    {
-      simulate_input(handle);
-      handle->buffer[PREV_PTR(handle->self_ptr)].used_real = false;
+      handle->buffer[PREV_PTR(handle->self_ptr)].used_real = true;
+      handle->buffer[handle->read_ptr].is_simulated = false;
+      handle->read_ptr = NEXT_PTR(handle->read_ptr);
       return true;
    }
 
diff --git a/ssnes.c b/ssnes.c
index 1bddf42ed7..35d61d959b 100644
--- a/ssnes.c
+++ b/ssnes.c
@@ -276,12 +276,6 @@ static void fill_pathname(char *out_path, char *in_path, const char *replace)
    strcat(out_path, replace);
 }
 
-#ifdef HAVE_FFMPEG
-#define FFMPEG_HELP_QUARK " | -r/--record "
-#else
-#define FFMPEG_HELP_QUARK
-#endif
-
 #ifdef _WIN32
 #define SSNES_DEFAULT_CONF_PATH_STR "\n\tDefaults to ssnes.cfg in same directory as ssnes.exe"
 #else
@@ -324,7 +318,7 @@ static void print_help(void)
    puts("===================================================================");
    puts("ssnes: Simple Super Nintendo Emulator (libsnes) -- v" PACKAGE_VERSION " --");
    puts("===================================================================");
-   puts("Usage: ssnes [rom file] [-h/--help | -c/--config | -v/--verbose | -4/--multitap | -j/--justifier | -J/--justifiers | -S/--savestate | -m/--mouse | -g/--gameboy | -b/--bsx | -B/--bsxslot | --sufamiA | --sufamiB | -p/--scope | -s/--save" FFMPEG_HELP_QUARK "]");
+   puts("Usage: ssnes [rom file] [options...]");
    puts("\t-h/--help: Show this help message");
    puts("\t-s/--save: Path for save file (*.srm). Required when rom is input from stdin");
    puts("\t-S/--savestate: Path to use for save states. If not selected, *.state will be assumed.");
@@ -345,6 +339,7 @@ static void print_help(void)
    puts("\t-P/--bsvplay: Playback a BSV movie file.");
    puts("\t-H/--host: Host netplay as player 1.");
    puts("\t-C/--connect: Connect to netplay as player 2.");
+   puts("\t--port: Port used to netplay. Default is 55435.");
    puts("\t-F/--frames: Sync frames when using netplay.");
 
 #ifdef HAVE_FFMPEG
@@ -373,6 +368,8 @@ static void parse_input(int argc, char *argv[])
       exit(1);
    }
 
+   int val = 0;
+
    struct option opts[] = {
       { "help", 0, NULL, 'h' },
       { "save", 1, NULL, 's' },
@@ -398,6 +395,7 @@ static void parse_input(int argc, char *argv[])
       { "host", 0, NULL, 'H' },
       { "connect", 1, NULL, 'C' },
       { "frames", 1, NULL, 'F' },
+      { "port", 1, &val, 'p' },
       { NULL, 0, NULL, 0 }
    };
 
@@ -418,6 +416,7 @@ static void parse_input(int argc, char *argv[])
    char optstring[] = "hs:vS:m:p4jJg:b:B:Y:Z:P:HC:F:" FFMPEG_RECORD_ARG CONFIG_FILE_ARG;
    for(;;)
    {
+      val = 0;
       int c = getopt_long(argc, argv, optstring, opts, &option_index);
       int port;
 
@@ -529,6 +528,17 @@ static void parse_input(int argc, char *argv[])
                g_extern.netplay_sync_frames = 32;
             break;
 
+         case 0:
+            switch (val)
+            {
+               case 'p':
+                  g_extern.netplay_port = strtol(optarg, NULL, 0);
+                  break;
+               default:
+                  break;
+            }
+            break;
+
          case '?':
             print_help();
             exit(1);
@@ -763,6 +773,8 @@ static void deinit_movie(void)
       bsv_movie_free(g_extern.bsv_movie);
 }
 
+#define SSNES_DEFAULT_PORT 55435
+
 static void init_netplay(void)
 {
    if (g_extern.netplay_enable)
@@ -782,7 +794,7 @@ static void init_netplay(void)
       else
          SSNES_LOG("Waiting for client...\n");
 
-      g_extern.netplay = netplay_new(g_extern.netplay_is_client ? g_extern.netplay_server : NULL, 55435, g_extern.netplay_sync_frames, &cbs);
+      g_extern.netplay = netplay_new(g_extern.netplay_is_client ? g_extern.netplay_server : NULL, g_extern.netplay_port ? g_extern.netplay_port : SSNES_DEFAULT_PORT, g_extern.netplay_sync_frames, &cbs);
       if (!g_extern.netplay)
       {
          g_extern.netplay_is_client = false;