diff --git a/srcpkgs/grub-utils b/srcpkgs/grub-utils
new file mode 120000
index 00000000000..2c8276e741a
--- /dev/null
+++ b/srcpkgs/grub-utils
@@ -0,0 +1 @@
+grub
\ No newline at end of file
diff --git a/srcpkgs/grub/template b/srcpkgs/grub/template
index 8f82d7ae02c..32b87c0c043 100644
--- a/srcpkgs/grub/template
+++ b/srcpkgs/grub/template
@@ -1,7 +1,7 @@
 # Template file for 'grub'
 pkgname=grub
 version=2.00
-revision=13
+revision=14
 hostmakedepends="flex"
 makedepends="libusb-compat-devel ncurses-devel freetype-devel
  liblzma-devel device-mapper-devel font-unifont-bdf fuse-devel"
@@ -87,6 +87,26 @@ do_install() {
 	vmkdir usr/share/bash-completion/completions
 	mv ${DESTDIR}/etc/bash_completion.d/grub \
 		${DESTDIR}/usr/share/bash-completion/completions
+
+	# Remove useless tools
+	rm ${DESTDIR}/usr/sbin/grub-ofpathname
+	rm ${DESTDIR}/usr/sbin/grub-sparc64-setup
+}
+
+grub-utils_package() {
+	short_desc+=" - additional utilities"
+	depends="grub>=${version}"
+	pkg_install() {
+		vmove usr/bin/grub-menulst2cfg
+		vmove usr/bin/grub-mkrelpath
+		vmove usr/bin/grub-mkpasswd-pbkdf2
+		vmove usr/bin/grub-script-check
+		vmove usr/bin/grub-editenv
+		vmove usr/bin/grub-mklayout
+		vmove usr/bin/grub-fstest
+		vmove usr/bin/grub-mkfont
+		vmove usr/bin/grub-mount
+	}
 }
 
 if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then