diff --git a/gossip/src/main.rs b/gossip/src/main.rs
index 2e98516583778d..e9cf4be698137d 100644
--- a/gossip/src/main.rs
+++ b/gossip/src/main.rs
@@ -29,6 +29,23 @@ fn parse_matches() -> ArgMatches<'static> {
         .default_value("0")
         .help("Filter gossip nodes by this shred version");
 
+    let gossip_port_arg = clap::Arg::with_name("gossip_port")
+        .long("gossip-port")
+        .value_name("PORT")
+        .takes_value(true)
+        .validator(is_port)
+        .help("Gossip port number for the node");
+
+    let gossip_host_arg = clap::Arg::with_name("gossip_host")
+        .long("gossip-host")
+        .value_name("HOST")
+        .takes_value(true)
+        .validator(solana_net_utils::is_host)
+        .help(
+            "Gossip DNS name or IP address for the node to advertise in gossip \
+                [default: ask --entrypoint, or 127.0.0.1 when --entrypoint is not provided]",
+        );
+
     App::new(crate_name!())
         .about(crate_description!())
         .version(solana_version::version!())
@@ -75,6 +92,8 @@ fn parse_matches() -> ArgMatches<'static> {
                         .help("Timeout in seconds"),
                 )
                 .arg(&shred_version_arg)
+                .arg(&gossip_port_arg)
+                .arg(&gossip_host_arg)
                 .setting(AppSettings::DisableVersion),
         )
         .subcommand(
@@ -90,23 +109,6 @@ fn parse_matches() -> ArgMatches<'static> {
                         .validator(solana_net_utils::is_host_port)
                         .help("Rendezvous with the cluster at this entrypoint"),
                 )
-                .arg(
-                    clap::Arg::with_name("gossip_port")
-                        .long("gossip-port")
-                        .value_name("PORT")
-                        .takes_value(true)
-                        .validator(is_port)
-                        .help("Gossip port number for the node"),
-                )
-                .arg(
-                    clap::Arg::with_name("gossip_host")
-                        .long("gossip-host")
-                        .value_name("HOST")
-                        .takes_value(true)
-                        .validator(solana_net_utils::is_host)
-                        .help("Gossip DNS name or IP address for the node to advertise in gossip \
-                               [default: ask --entrypoint, or 127.0.0.1 when --entrypoint is not provided]"),
-                )
                 .arg(
                     Arg::with_name("identity")
                         .short("i")
@@ -144,6 +146,8 @@ fn parse_matches() -> ArgMatches<'static> {
                         .help("Public key of a specific node to wait for"),
                 )
                 .arg(&shred_version_arg)
+                .arg(&gossip_port_arg)
+                .arg(&gossip_host_arg)
                 .arg(
                     Arg::with_name("timeout")
                         .long("timeout")
@@ -241,6 +245,7 @@ fn process_spy(matches: &ArgMatches, socket_addr_space: SocketAddrSpace) -> std:
             .expect("unable to find an available gossip port")
         }),
     );
+
     let discover_timeout = Duration::from_secs(timeout.unwrap_or(u64::MAX));
     let (_all_peers, validators) = discover(
         identity_keypair,
@@ -283,6 +288,20 @@ fn process_rpc_url(
     let entrypoint_addr = parse_entrypoint(matches);
     let timeout = value_t_or_exit!(matches, "timeout", u64);
     let shred_version = value_t_or_exit!(matches, "shred_version", u16);
+
+    let gossip_host = parse_gossip_host(matches, entrypoint_addr);
+
+    let gossip_addr = SocketAddr::new(
+        gossip_host,
+        value_t!(matches, "gossip_port", u16).unwrap_or_else(|_| {
+            solana_net_utils::find_available_port_in_range(
+                IpAddr::V4(Ipv4Addr::UNSPECIFIED),
+                (0, 1),
+            )
+            .expect("unable to find an available gossip port")
+        }),
+    );
+
     let (_all_peers, validators) = discover(
         None, // keypair
         entrypoint_addr.as_ref(),
@@ -290,7 +309,7 @@ fn process_rpc_url(
         Duration::from_secs(timeout),
         None,                     // find_nodes_by_pubkey
         entrypoint_addr.as_ref(), // find_node_by_gossip_addr
-        None,                     // my_gossip_addr
+        Some(&gossip_addr),       // my_gossip_addr
         shred_version,
         socket_addr_space,
     )?;