diff --git a/configuration/live-dvd-X.nix b/configuration/live-dvd-X.nix
new file mode 100644
index 000000000000..df644a522cab
--- /dev/null
+++ b/configuration/live-dvd-X.nix
@@ -0,0 +1,77 @@
+{platform ? __currentSystem} : 
+let 
+  isoFun = import ./rescue-cd-configurable.nix;
+in 
+(isoFun {
+	inherit platform;
+	lib = (import ../pkgs/lib);
+
+	networkNixpkgs = "";
+	manualEnabled = true;
+	rogueEnabled = true;
+	sshdEnabled = true;
+	fontConfigEnabled = true;
+	sudoEnable = true;
+	includeMemtest = true;
+	includeStdenv = true;
+	includeBuildDeps = true;
+
+	kernel = pkgs: (
+		pkgs.module_aggregation 
+		[pkgs.kernel]
+	);
+
+	packages = pkgs : [
+		pkgs.irssi
+		pkgs.elinks
+		pkgs.ltrace
+		pkgs.subversion
+		pkgs.which
+		pkgs.file
+		pkgs.zip
+		pkgs.unzip
+		pkgs.unrar
+		pkgs.usbutils
+		pkgs.bc
+		pkgs.cpio
+		pkgs.ncat
+		pkgs.patch
+		pkgs.fuse
+		pkgs.indent
+		pkgs.zsh
+		pkgs.hddtemp
+		pkgs.hdparm
+		pkgs.sdparm
+		pkgs.sqlite
+		pkgs.wpa_supplicant
+		pkgs.lynx
+		pkgs.db4
+		pkgs.rogue
+		pkgs.attr
+		pkgs.acl
+		pkgs.automake
+		pkgs.autoconf
+		pkgs.libtool
+		pkgs.gnupg
+		pkgs.openssl
+		pkgs.units
+		pkgs.gnumake
+		pkgs.manpages
+		pkgs.cabextract
+		pkgs.upstartJobControl
+		pkgs.fpc
+		pkgs.python
+		pkgs.perl
+		pkgs.lftp
+		pkgs.wget
+		pkgs.guile
+		pkgs.utillinuxCurses
+		pkgs.emacs
+		pkgs.iproute
+		pkgs.MPlayer
+		pkgs.diffutils
+		pkgs.pciutils
+		pkgs.lsof
+		pkgs.vimHugeX
+	];
+}).rescueCD
diff --git a/system/options.nix b/system/options.nix
index 8275db54af95..ad98359ab142 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1280,6 +1280,14 @@
         ";
       };
 
+      autorun = mkOption {
+        default = true;
+	description = "
+	  Switch to false to create upstart-job and configuration, 
+	  but not run it automatically
+	";
+      };
+
       username = mkOption {
         default = "";
         description = "
diff --git a/upstart-jobs/gw6c.nix b/upstart-jobs/gw6c.nix
index 416bcd91841d..6f2a7db3027d 100644
--- a/upstart-jobs/gw6c.nix
+++ b/upstart-jobs/gw6c.nix
@@ -20,7 +20,7 @@ in
 	job = "
 description \"Gateway6 client\"
 
-start on network-interfaces/started
+start on ${ if cfg.autorun then "network-interfaces/started" else "never" }
 stop on network-interfaces/stop
 
 respawn ${gw6cService}/bin/control start