diff --git a/upstart-jobs/gw6c.nix b/upstart-jobs/gw6c.nix
index faf1519d2a91..812d4081babe 100644
--- a/upstart-jobs/gw6c.nix
+++ b/upstart-jobs/gw6c.nix
@@ -17,8 +17,8 @@ in
 	job = "
 description \"Gateway6 client\"
 
-start on network/interfaces started
-stop on network/interfaces stop
+start on network-interfaces/started
+stop on network-interfaces/stop
 
 respawn ${gw6cService}/bin/control start
 ";
diff --git a/upstart-jobs/httpd.nix b/upstart-jobs/httpd.nix
index 276df7971fdb..eec1583293a3 100644
--- a/upstart-jobs/httpd.nix
+++ b/upstart-jobs/httpd.nix
@@ -22,6 +22,9 @@ let
   enableSSL = false;
   noUserDir = getCfg "noUserDir";
   extraDirectories = getCfg "extraDirectories";
+
+  startingDependency = if (config.get [ "services" "gw6c" "enable" ]) 
+	then "gw6c" else "network-interfaces";
   
   webServer = import ../services/apache-httpd {
     inherit (pkgs) apacheHttpd coreutils;
@@ -99,8 +102,8 @@ in
   job = "
 description \"Apache HTTPD\"
 
-start on network-interfaces/started
-stop on network-interfaces/stop
+start on ${startingDependency}/started
+stop on ${startingDependency}/stop
 
 start script
     ${webServer}/bin/control prepare