diff --git a/beacon_node/client/src/client_config.rs b/beacon_node/client/src/client_config.rs
index cad287f2cc..f7a257a3a9 100644
--- a/beacon_node/client/src/client_config.rs
+++ b/beacon_node/client/src/client_config.rs
@@ -10,6 +10,7 @@ use std::path::PathBuf;
 use types::multiaddr::Protocol;
 use types::multiaddr::ToMultiaddr;
 use types::ChainSpec;
+use types::Multiaddr;
 
 /// Stores the client configuration for this Lighthouse instance.
 #[derive(Debug, Clone)]
@@ -88,6 +89,17 @@ impl ClientConfig {
             }
         }
 
+        // Custom bootnodes
+        // TODO: Handle list of addresses
+        if let Some(boot_addresses_str) = args.value_of("boot_nodes") {
+            if let Ok(boot_address) = boot_addresses_str.parse::<Multiaddr>() {
+                config.net_conf.boot_nodes.append(&mut vec![boot_address]);
+            } else {
+                error!(log, "Invalid Bootnode multiaddress"; "Multiaddr" => boot_addresses_str);
+                return Err("Invalid IP Address");
+            }
+        }
+
         /* Filesystem related arguments */
 
         // Custom datadir
diff --git a/beacon_node/src/main.rs b/beacon_node/src/main.rs
index ea74c73766..a4e1ee1308 100644
--- a/beacon_node/src/main.rs
+++ b/beacon_node/src/main.rs
@@ -16,6 +16,7 @@ fn main() {
         .version(version::version().as_str())
         .author("Sigma Prime <contact@sigmaprime.io>")
         .about("Eth 2.0 Client")
+        // file system related arguments
         .arg(
             Arg::with_name("datadir")
                 .long("datadir")
@@ -23,6 +24,7 @@ fn main() {
                 .help("Data directory for keys and databases.")
                 .takes_value(true),
         )
+        // network related arguments
         .arg(
             Arg::with_name("listen_address")
                 .long("listen-address")
@@ -37,6 +39,14 @@ fn main() {
                 .help("Network listen port for p2p connections.")
                 .takes_value(true),
         )
+        .arg(
+            Arg::with_name("boot-nodes")
+                .long("boot-nodes")
+                .value_name("BOOTNODES")
+                .help("A list of comma separated multi addresses representing bootnodes to connect to.")
+                .takes_value(true),
+        )
+        // rpc related arguments
         .arg(
             Arg::with_name("rpc")
                 .long("rpc")