diff --git a/installer/grub-menu-builder.sh b/installer/grub-menu-builder.sh
index 4ad99bebb56..6b5614e9a57 100644
--- a/installer/grub-menu-builder.sh
+++ b/installer/grub-menu-builder.sh
@@ -35,12 +35,18 @@ if test -n "@grubSplashImage@"; then
     echo "splashimage $splashLocation" >> $tmp
 fi
 
+configurationCounter=0;
 
 addEntry() {
     local name="$1"
     local path="$2"
     local shortSuffix="$3"
 
+    configurationCounter=$((configurationCounter + 1))
+    if test $configurationCounter -gt @configurationLimit@ ; then
+	    return
+    fi;
+
     if ! test -e $path/kernel -a -e $path/initrd; then
         return
     fi
@@ -48,6 +54,16 @@ addEntry() {
     local kernel=$(readlink -f $path/kernel)
     local initrd=$(readlink -f $path/initrd)
 
+    if test "$path" = "$default"; then
+	    cp "$kernel" /boot/nixos-kernel
+	    cp "$initrd" /boot/nixos-initrd
+	    cp "$(readlink -f "$path/init")" /boot/nixos-init
+	    cat > /boot/nixos-grub-config <<EOF
+	kernel ${bootMount:-/boot}/nixos-kernel systemConfig=$(readlink -f "$path") init=${bootMount:-/boot}/nixos-init $(cat "$path/kernel-params")
+	initrd ${bootMount:-/boot}/nixos-initrd
+EOF
+    fi
+
     if test -n "@copyKernels@"; then
         local kernel2=/boot/kernels/$(echo $kernel | sed 's^/^-^g')
         if ! test -e $kernel2; then
diff --git a/system/options.nix b/system/options.nix
index f002168ab8e..8275db54af9 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -251,6 +251,15 @@
       ";
     };
 
+    configurationLimit = mkOption {
+      default = 100;
+      example = 120;
+      description = "
+        Maximum of configurations in boot menu. GRUB has problems when
+	there are too many entries.
+      ";
+    };
+
   };
 
 
diff --git a/system/system.nix b/system/system.nix
index d159458701f..a1ceb345ccd 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -324,7 +324,7 @@ rec {
     inherit (pkgs) bash;
     path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep];
     inherit (config.boot) copyKernels extraGrubEntries
-      grubSplashImage bootMount;
+      grubSplashImage bootMount configurationLimit;
   };