diff --git a/bootloader-config-32bit/bootloader-config b/bootloader-config-32bit/bootloader-config
new file mode 100755
index 00000000..0dbae957
--- /dev/null
+++ b/bootloader-config-32bit/bootloader-config
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g")
+
+# Set secure permissions for the initramfs if we're configuring
+# full-disk-encryption. The initramfs is re-generated later in the
+# installation process so we only set the permissions snippet without
+# regenerating the initramfs right now:
+if [ "$(mount | grep $CHROOT" " | cut -c -16)" = "/dev/mapper/luks" ]; then
+    echo "UMASK=0077" > $CHROOT/etc/initramfs-tools/conf.d/initramfs-permissions
+fi
+
+echo "Running bootloader-config..."
+
+if [ -d /sys/firmware/efi/efivars ]; then
+    echo " * Installing grub-efi (uefi)..."
+    DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-efi-ia32 cryptsetup keyutils
+else
+    echo " * install grub... (bios)"
+    DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-pc cryptsetup keyutils
+fi
diff --git a/build-32-non-pae.sh b/build-32-non-pae.sh
index 27412337..1b288113 100755
--- a/build-32-non-pae.sh
+++ b/build-32-non-pae.sh
@@ -247,6 +247,7 @@ cp $build/hooks/live/* $build/build/config/hooks/live
 cp $build/hooks/normal/* $build/build/config/hooks/normal
 cp $build/install-debian/* $build/build/config/includes.chroot/usr/share/pixmaps
 cp $build/sources-final/* $build/build/config/includes.chroot/usr/sbin
+cp $build/bootloader-config-32bit/* $build/build/config/includes.chroot/usr/sbin
 
 cp -r $build/lightdm/* $build/build/config/includes.chroot/etc/lightdm
 cp -r $build/bootloaders/* $build/build/config/bootloaders
diff --git a/build-32.sh b/build-32.sh
index 87c95b08..8ed1a4a5 100755
--- a/build-32.sh
+++ b/build-32.sh
@@ -246,6 +246,7 @@ cp $build/hooks/live/* $build/build/config/hooks/live
 cp $build/hooks/normal/* $build/build/config/hooks/normal
 cp $build/install-debian/* $build/build/config/includes.chroot/usr/share/pixmaps
 cp $build/sources-final/* $build/build/config/includes.chroot/usr/sbin
+cp $build/bootloader-config-32bit/* $build/build/config/includes.chroot/usr/sbin
 
 cp -r $build/lightdm/* $build/build/config/includes.chroot/etc/lightdm
 cp -r $build/bootloaders/* $build/build/config/bootloaders