diff --git a/sysutils/grub2-efi/Makefile b/sysutils/grub2-efi/Makefile
index 6adabb040567..3f15a3329f5c 100644
--- a/sysutils/grub2-efi/Makefile
+++ b/sysutils/grub2-efi/Makefile
@@ -9,7 +9,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Multiboot EFI boot loader
 WWW=		https://www.gnu.org/software/grub/
 
-LICENSE=	GPLv3
+LICENSE=	GPLv3+
 
 RUN_DEPENDS=	${LOCALBASE}/bin/mformat:filesystems/mtools \
 		${LOCALBASE}/bin/grub-mkrescue:sysutils/grub2-pcbsd
@@ -21,20 +21,19 @@ ONLY_FOR_ARCHS=	amd64
 USES=		autoreconf:build bison cpe gettext gmake python tar:xz
 
 WRKSRC=		${WRKDIR}/grub-${PORTVERSION}
+INSTALL_WRKSRC=	${WRKSRC}/grub-core
 SSP_UNSAFE=	yes
-USE_GCC=	yes
+USE_GCC=	yes:build
 GNU_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=	yes
 
 CPE_PRODUCT=	grub
 CPE_VENDOR=	gnu
 
-CONFIGURE_ARGS=	--with-platform=efi --disable-werror --localedir=${PREFIX}/share/locale
+CONFIGURE_ARGS=	--with-platform=efi --disable-werror \
+		--localedir=${PREFIX}/share/locale
 CONFIGURE_ENV=	CPP="${CC} -E" \
 		LEX=${LOCALBASE}/bin/flex
-CFLAGS+=	-fpermissive
-
-.include <bsd.port.pre.mk>
 
 post-patch:
 	@${LN} -s ${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf ${WRKSRC}
@@ -45,11 +44,7 @@ pre-configure:
 	cd ${WRKSRC} && ./autogen.sh
 
 post-configure:
-	@${LN} -sfh /usr/include/machine /usr/include/sys /usr/include/x86 ${WRKSRC}/grub-core
+	@${LN} -sfh /usr/include/machine /usr/include/sys /usr/include/x86 \
+		${WRKSRC}/grub-core
 
-do-install:
-	@cd ${WRKSRC}/grub-core && ${GMAKE} install DESTDIR=${STAGEDIR}
-
-RUN_DEPENDS:=	${RUN_DEPENDS:Ngcc*}
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/grub2-efi/files/patch-grub-core_disk_geli.c b/sysutils/grub2-efi/files/patch-grub-core_disk_geli.c
index f8d1f9bed333..318610292ea0 100644
--- a/sysutils/grub2-efi/files/patch-grub-core_disk_geli.c
+++ b/sysutils/grub2-efi/files/patch-grub-core_disk_geli.c
@@ -1,12 +1,20 @@
 --- grub-core/disk/geli.c.orig	2015-01-30 16:34:55 UTC
 +++ grub-core/disk/geli.c
-@@ -445,6 +445,9 @@ recover_key (grub_disk_t source, grub_cr
+@@ -50,6 +50,7 @@
+ #include <grub/misc.h>
+ #include <grub/mm.h>
+ #include <grub/dl.h>
++#include <grub/env.h>
+ #include <grub/err.h>
+ #include <grub/disk.h>
+ #include <grub/crypto.h>
+@@ -444,6 +445,9 @@ recover_key (grub_disk_t source, grub_cryptodisk_t dev
+   grub_free (tmp);
    if (!grub_password_get (passphrase, MAX_PASSPHRASE))
      return grub_error (GRUB_ERR_BAD_ARGUMENT, "Passphrase not supplied");
- 
++
 +  /* Set the GELI passphrase to GRUB env, for passing to FreeBSD kernel */
 +  grub_env_set ("gelipassphrase", passphrase);
-+
+ 
    /* Calculate the PBKDF2 of the user supplied passphrase.  */
    if (grub_le_to_cpu32 (header.niter) != 0)
-     {