diff --git a/templates/grub2-devel b/templates/grub2-devel
new file mode 120000
index 00000000000..d0335b04648
--- /dev/null
+++ b/templates/grub2-devel
@@ -0,0 +1 @@
+grub2
\ No newline at end of file
diff --git a/templates/grub2/devel.template b/templates/grub2/devel.template
new file mode 100644
index 00000000000..b6b7950291d
--- /dev/null
+++ b/templates/grub2/devel.template
@@ -0,0 +1,14 @@
+# Template file for 'grub2-devel'.
+#
+short_desc="GRUB 2 development files"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run grub2 ${version}
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+}
diff --git a/templates/grub2/files/grub.default b/templates/grub2/files/grub.default
new file mode 100644
index 00000000000..90e1aa0a364
--- /dev/null
+++ b/templates/grub2/files/grub.default
@@ -0,0 +1,15 @@
+#
+# Example configuration file for grub2.
+#
+GRUB_DEFAULT=0
+#GRUB_HIDDENT_TIMEOUT=0
+#GRUB_HIDDEN_TIMEOUT_QUIET=false
+GRUB_TIMEOUT=5
+GRUB_DISTRIBUTOR="XBPS"
+GRUB_CMDLINE_LINUX_DEFAULT="quiet"
+#GRUB_TERMINAL=console
+GRUB_GFXMODE=640x480
+#GRUB_DISABLE_LINUX_UUID=true
+#GRUB_DISABLE_LINUX_RECOVERY=true
+
+
diff --git a/templates/grub2/template b/templates/grub2/template
new file mode 100644
index 00000000000..c5b3fb597de
--- /dev/null
+++ b/templates/grub2/template
@@ -0,0 +1,31 @@
+# Template file for 'grub2'
+pkgname=grub2
+version=1.97~beta3
+wrksrc=grub-$version
+distfiles="ftp://alpha.gnu.org/gnu/grub/grub-$version.tar.gz"
+build_style=gnu_configure
+configure_args="--enable-grub-emu --enable-grub-emu-usb
+ --enable-grub-fstest --enable-grub-pe2elf --enable-grub-mkfont"
+short_desc="GRand Unified Bootloader 2"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=8a396ddd54ac46c2d3dcb8f1b73c5434b11249b041d3aacdd945f75302da2bb7
+long_desc="
+ This is GRUB 2, the second version of the GRand Unified Bootloader.
+ GRUB 2 is rewritten from scratch to make GNU GRUB cleaner, safer, more
+ robust, more powerful, and more portable."
+
+subpackages="devel"
+conf_files="/etc/default/grub /etc/grub.d/40_custom"
+
+Add_dependency full	glibc
+Add_dependency build	bison
+Add_dependency full	libusb-compat
+Add_dependency build	ncurses
+Add_dependency full	freetype
+
+post_install()
+{
+	install -d ${DESTDIR}/etc/default
+	install -m644 ${FILESDIR}/grub.default ${DESTDIR}/etc/default/grub
+}
+Add_dependency build	ruby