diff --git a/substrate/Cargo.lock b/substrate/Cargo.lock
index 0333904bff..440b3b218e 100644
--- a/substrate/Cargo.lock
+++ b/substrate/Cargo.lock
@@ -3400,6 +3400,7 @@ dependencies = [
  "sc-service",
  "sc-service-test",
  "sc-telemetry",
+ "sc-tracing",
  "sc-transaction-pool",
  "serde",
  "sp-authority-discovery",
@@ -3417,6 +3418,7 @@ dependencies = [
  "structopt",
  "substrate-build-script-utils",
  "tempfile",
+ "tracing",
  "vergen",
  "wasm-bindgen",
  "wasm-bindgen-futures",
diff --git a/substrate/bin/node/cli/Cargo.toml b/substrate/bin/node/cli/Cargo.toml
index d5f3f45b31..dad76ae4bf 100644
--- a/substrate/bin/node/cli/Cargo.toml
+++ b/substrate/bin/node/cli/Cargo.toml
@@ -32,6 +32,7 @@ jsonrpc-core = "14.0.3"
 log = "0.4.8"
 rand = "0.7.2"
 structopt = { version = "0.3.8", optional = true }
+tracing = "0.1.10"
 
 # primitives
 sp-authority-discovery = { version = "2.0.0",  path = "../../../primitives/authority-discovery" }
@@ -60,6 +61,7 @@ sc-offchain = { version = "2.0.0", path = "../../../client/offchain" }
 sc-rpc = { version = "2.0.0", path = "../../../client/rpc" }
 sc-basic-authorship = { version = "0.8", path = "../../../client/basic-authorship" }
 sc-service = { version = "0.8", default-features = false, path = "../../../client/service" }
+sc-tracing = { version = "2.0.0", path = "../../../client/tracing" }
 sc-telemetry = { version = "2.0.0", path = "../../../client/telemetry" }
 sc-authority-discovery = { version = "0.8",  path = "../../../client/authority-discovery" }
 
diff --git a/substrate/bin/node/cli/src/command.rs b/substrate/bin/node/cli/src/command.rs
index eb18d6d8b3..f5d747a146 100644
--- a/substrate/bin/node/cli/src/command.rs
+++ b/substrate/bin/node/cli/src/command.rs
@@ -56,6 +56,16 @@ where
 				_ => panic!("Factory is only supported for development and local testnet."),
 			}
 
+			// Setup tracing.
+			if let Some(tracing_targets) = cli_args.shared_params.tracing_targets.as_ref() {
+				let subscriber = sc_tracing::ProfilingSubscriber::new(
+					cli_args.shared_params.tracing_receiver.into(), tracing_targets
+				);
+				if let Err(e) = tracing::subscriber::set_global_default(subscriber) {
+					panic!("Unable to set global default subscriber {}", e);
+				}
+			}
+
 			let factory_state = FactoryState::new(
 				cli_args.mode.clone(),
 				cli_args.num,
diff --git a/substrate/client/cli/src/lib.rs b/substrate/client/cli/src/lib.rs
index 7f72689336..0965a79f15 100644
--- a/substrate/client/cli/src/lib.rs
+++ b/substrate/client/cli/src/lib.rs
@@ -638,8 +638,8 @@ where
 		config.telemetry_endpoints = Some(TelemetryEndpoints::new(cli.telemetry_endpoints));
 	}
 
-	config.tracing_targets = cli.tracing_targets.into();
-	config.tracing_receiver = cli.tracing_receiver.into();
+	config.tracing_targets = cli.shared_params.tracing_targets.into();
+	config.tracing_receiver = cli.shared_params.tracing_receiver.into();
 
 	// Imply forced authoring on --dev
 	config.force_authoring = cli.shared_params.dev || cli.force_authoring;
diff --git a/substrate/client/cli/src/params.rs b/substrate/client/cli/src/params.rs
index 3a4aa319c6..1dc6b0567c 100644
--- a/substrate/client/cli/src/params.rs
+++ b/substrate/client/cli/src/params.rs
@@ -113,6 +113,20 @@ pub struct SharedParams {
 	/// Sets a custom logging filter.
 	#[structopt(short = "l", long = "log", value_name = "LOG_PATTERN")]
 	pub log: Option<String>,
+
+	/// Comma separated list of targets for tracing
+	#[structopt(long = "tracing-targets", value_name = "TARGETS")]
+	pub tracing_targets: Option<String>,
+
+	/// Receiver to process tracing messages
+	#[structopt(
+		long = "tracing-receiver",
+		value_name = "RECEIVER",
+		possible_values = &TracingReceiver::variants(),
+		case_insensitive = true,
+		default_value = "Log"
+	)]
+	pub tracing_receiver: TracingReceiver,
 }
 
 /// Parameters for block import.
@@ -579,20 +593,6 @@ pub struct RunCmd {
 	#[structopt(long = "force-authoring")]
 	pub force_authoring: bool,
 
-	/// Comma separated list of targets for tracing
-	#[structopt(long = "tracing-targets", value_name = "TARGETS")]
-	pub tracing_targets: Option<String>,
-
-	/// Receiver to process tracing messages
-	#[structopt(
-		long = "tracing-receiver",
-		value_name = "RECEIVER",
-		possible_values = &TracingReceiver::variants(),
-		case_insensitive = true,
-		default_value = "Log"
-	)]
-	pub tracing_receiver: TracingReceiver,
-
 	/// Specify custom keystore path.
 	#[structopt(long = "keystore-path", value_name = "PATH", parse(from_os_str))]
 	pub keystore_path: Option<PathBuf>,