diff --git a/beacon_node/client/src/client_config.rs b/beacon_node/client/src/client_config.rs
index 15512342c..a34b83253 100644
--- a/beacon_node/client/src/client_config.rs
+++ b/beacon_node/client/src/client_config.rs
@@ -140,6 +140,19 @@ impl ClientConfig {
             }
         }
 
+        /* HTTP related arguments */
+
+        if args.is_present("http") {
+            config.http_conf.enabled = true;
+        }
+
+        if let Some(listen_address) = args.value_of("http-address") {
+            config.http_conf.listen_address = listen_address.to_string();
+        }
+        if let Some(listen_port) = args.value_of("http-port") {
+            config.http_conf.listen_port = listen_port.to_string();
+        }
+
         match args.value_of("db") {
             Some("disk") => config.db_type = DBType::Disk,
             Some("memory") => config.db_type = DBType::Memory,
diff --git a/beacon_node/client/src/lib.rs b/beacon_node/client/src/lib.rs
index 734de4727..9bcae66ef 100644
--- a/beacon_node/client/src/lib.rs
+++ b/beacon_node/client/src/lib.rs
@@ -115,13 +115,17 @@ where
         // Start the `http_server` service.
         //
         // Note: presently we are ignoring the config and _always_ starting a HTTP server.
-        let http_exit_signal = Some(http_server::start_service(
-            &config.http_conf,
-            executor,
-            network_send,
-            beacon_chain.clone(),
-            &log,
-        ));
+        let http_exit_signal = if config.http_conf.enabled {
+            Some(http_server::start_service(
+                &config.http_conf,
+                executor,
+                network_send,
+                beacon_chain.clone(),
+                &log,
+            ))
+        } else {
+            None
+        };
 
         let (slot_timer_exit_signal, exit) = exit_future::signal();
         if let Ok(Some(duration_to_next_slot)) = beacon_chain.slot_clock.duration_to_next_slot() {
diff --git a/beacon_node/http_server/src/lib.rs b/beacon_node/http_server/src/lib.rs
index f8f5b6741..02629f725 100644
--- a/beacon_node/http_server/src/lib.rs
+++ b/beacon_node/http_server/src/lib.rs
@@ -15,13 +15,15 @@ use tokio::runtime::TaskExecutor;
 pub struct HttpServerConfig {
     pub enabled: bool,
     pub listen_address: String,
+    pub listen_port: String,
 }
 
 impl Default for HttpServerConfig {
     fn default() -> Self {
         Self {
             enabled: false,
-            listen_address: "127.0.0.1:5052".to_string(),
+            listen_address: "127.0.0.1".to_string(),
+            listen_port: "5052".to_string(),
         }
     }
 }
@@ -69,16 +71,14 @@ pub fn start_service<T: BeaconChainTypes + 'static>(
     // 2. Build an exit future that will shutdown the server when requested.
     // 3. Return the exit future, so the caller may shutdown the service when desired.
     let http_service = {
+        let listen_address = format!("{}:{}", config.listen_address, config.listen_port);
         // Start the HTTP server
-        let server_start_result = iron.http(config.listen_address.clone());
+        let server_start_result = iron.http(listen_address.clone());
 
         if server_start_result.is_ok() {
-            info!(log, "HTTP server running on {}", config.listen_address);
+            info!(log, "HTTP server running on {}", listen_address);
         } else {
-            warn!(
-                log,
-                "HTTP server failed to start on {}", config.listen_address
-            );
+            warn!(log, "HTTP server failed to start on {}", listen_address);
         }
 
         // Build a future that will shutdown the HTTP server when the `shutdown_trigger` is
diff --git a/beacon_node/src/main.rs b/beacon_node/src/main.rs
index ef2121882..65f1899a0 100644
--- a/beacon_node/src/main.rs
+++ b/beacon_node/src/main.rs
@@ -68,6 +68,28 @@ fn main() {
                 .help("Listen port for RPC endpoint.")
                 .takes_value(true),
         )
+        // HTTP related arguments
+        .arg(
+            Arg::with_name("http")
+                .long("http")
+                .value_name("HTTP")
+                .help("Enable the HTTP server.")
+                .takes_value(false),
+        )
+        .arg(
+            Arg::with_name("http-address")
+                .long("http-address")
+                .value_name("HTTPADDRESS")
+                .help("Listen address for the HTTP server.")
+                .takes_value(true),
+        )
+        .arg(
+            Arg::with_name("http-port")
+                .long("http-port")
+                .value_name("HTTPPORT")
+                .help("Listen port for the HTTP server.")
+                .takes_value(true),
+        )
         .arg(
             Arg::with_name("db")
                 .long("db")