diff --git a/build-pkg.sh b/build-pkg.sh
index 8704cc2..e285d5d 100755
--- a/build-pkg.sh
+++ b/build-pkg.sh
@@ -38,8 +38,8 @@ function build-pkg() {
   cd "pkg/${PKG}" || return $?
 
   # Build and copy to /home/custompkgs
-   build-with-makepkg || {
-#  build-with-aurutils || {
+#   build-with-makepkg || {
+  build-with-aurutils || {
     echo "Failed to build package ${PKG}!";
     FAILED_PKGS+=("${PKG}");
   }
diff --git a/pkg/de-p1st-installer/de-p1st-installer.sh b/pkg/de-p1st-installer/de-p1st-installer.sh
index 86d3af7..5e97a70 100755
--- a/pkg/de-p1st-installer/de-p1st-installer.sh
+++ b/pkg/de-p1st-installer/de-p1st-installer.sh
@@ -110,7 +110,7 @@ function get_default_mount_options() {
 		;;
 	EXT4)
 	  # https://wiki.archlinux.org/index.php/Ext4#Enabling_metadata_checksums
-	  # If the CPU supports SSE 4.2, make sure the crc32c_intel kernel module is loaded (TODO)
+	  # If the CPU supports SSE 4.2, make sure the crc32c_intel kernel module is loaded
 		FS_DEFAULT_MOUNT_OPTIONS+=('metadata_csum')
 		;;
   F2FS)
@@ -315,8 +315,9 @@ function bootloader() {
     ;;
   esac
 
-  # TODO
-
+  sed -i "s|^GRUB_CMDLINE_LINUX=.*\$|GRUB_CMDLINE_LINUX=\"cryptdevice=/dev/disk/by-uuid/${LUKS_PART_UUID}:crypt\"|" \
+    /mnt/etc/default/grub || return $?
+  arch-chroot /mnt grub-mkconfig -o /boot/grub/grub.cfg || return $?
 }
 
 function main() {