diff --git a/srcpkgs/xbps-base-files/template b/srcpkgs/xbps-base-files/template
index 5692b372f4..729c660372 100644
--- a/srcpkgs/xbps-base-files/template
+++ b/srcpkgs/xbps-base-files/template
@@ -1,6 +1,6 @@
 # Template file for 'xbps-base-files'
 pkgname=xbps-base-files
-version=0.35
+version=0.36
 build_style=custom-install
 short_desc="xbps base system files"
 maintainer="Juan RP <xtraeme@gmail.com>"
diff --git a/xbps-src/triggers/initramfs-tools b/xbps-src/triggers/initramfs-tools
index 37d71c6bad..7359ee87a7 100755
--- a/xbps-src/triggers/initramfs-tools
+++ b/xbps-src/triggers/initramfs-tools
@@ -25,22 +25,20 @@ targets)
 run)
 	[ ! -x ${update_initramfs} ] && exit 0
 
-	initramfs_args="update-initramfs"
-
 	if [ "$PKGNAME" = "kernel" ]; then
 		if [ "$TARGET" = "post-remove" ]; then
 			exit 0
 		fi
 		if [ ! -f var/lib/initramfs-tools/${VERSION} ]; then
 			# Create new initramfs
-			initramfs_args="-c -t -k ${VERSION}"
+			initramfs_args="-B -c -t -k ${VERSION}"
 		else
 			# Update existing initramfs
-			initramfs_args="-u -t -k ${VERSION}"
+			initramfs_args="-B -u -t -k ${VERSION}"
 		fi
 	else
 		# Update initramfs for all kernels
-		initramfs_args="-u -t -k all"
+		initramfs_args="-B -u -t -k all"
 	fi
 
 	if [ ! -e /proc/filesystems ]; then
@@ -55,6 +53,10 @@ run)
 
 	${update_initramfs} ${initramfs_args}
 
+	if [ -x usr/sbin/grub-mkconfig ]; then
+		usr/sbin/grub-mkconfig -o boot/grub/grub.cfg
+	fi
+
 	if [ -n "$proc_mounted" ]; then
 		umount /proc
 	fi