diff --git a/system/options.nix b/system/options.nix
index 44b40dc56830..0e6f4bc0e933 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1742,6 +1742,14 @@
         ";
       };
 
+      waitPingableBroker = mkOption {
+        default = true;
+	example = false;
+	description = "
+	  Whether to wait until tunnel broker returns ICMP echo.
+	";
+      };
+
     };
 
 
diff --git a/upstart-jobs/gw6c.nix b/upstart-jobs/gw6c.nix
index 0f3d007e4166..f2586526dd25 100644
--- a/upstart-jobs/gw6c.nix
+++ b/upstart-jobs/gw6c.nix
@@ -13,6 +13,8 @@ let
 		everPing = cfg.everPing;
 
 		seccureKeys = config.security.seccureKeys;
+
+		waitPingableBroker = cfg.waitPingableBroker;
 	};
 in
 {