diff --git a/configuration/rescue-cd-configurable.nix b/configuration/rescue-cd-configurable.nix
index 987185cc85a..67282ba03bd 100644
--- a/configuration/rescue-cd-configurable.nix
+++ b/configuration/rescue-cd-configurable.nix
@@ -24,6 +24,7 @@ let
 	includeBuildDeps = arg "includeBuildDeps" false;
 	kernel = arg "kernel" (pkgs : pkgs.kernel);
 	addUsers = arg "addUsers" [];
+	extraInitrdKernelModules = arg "extraInitrdKernelModules" [];
 
 	/* Should return list of {configuration, suffix} attrsets.
 	{configuration=configuration; suffix=""} is always prepended.
@@ -107,6 +108,9 @@ rec {
       extraTTYs = [] ++ (lib.optional manualEnabled 7) ++
         (lib.optional rogueEnabled 8);
       inherit kernel;
+      initrd = {
+        extraKernelModules = extraInitrdKernelModules;
+      };
     };
     
     services = {
@@ -237,6 +241,7 @@ rec {
         pkgs.subversion # for nixos-checkout
         pkgs.w3m # needed for the manual anyway
       ] ++ (packages pkgs);
+      checkConfigurationOptions = true;
     };
 
     users = {
diff --git a/upstart-jobs/samba.nix b/upstart-jobs/samba.nix
index 08af9dec747..b1371c6f0f5 100644
--- a/upstart-jobs/samba.nix
+++ b/upstart-jobs/samba.nix
@@ -47,6 +47,8 @@ start script
   ${samba}/sbin/smbd -D  -s ${smbConfig} &
   ${samba}/sbin/winbindd -B -s ${smbConfig} &
 
+  ln -fs ${smbConfig} /var/samba/config
+
 end script
 
 respawn ${samba}/sbin/nmbd -D -s ${smbConfig} &; ${samba}/sbin/smbd -D -s ${smbConfig} &; ${samba}/sbin/winbindd -B &