diff --git a/sysutils/grub/Makefile b/sysutils/grub/Makefile
index 56e62e50930d..2c0cdf7fa3c6 100644
--- a/sysutils/grub/Makefile
+++ b/sysutils/grub/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	grub
-PORTVERSION=	0.5.96
+PORTVERSION=	0.90
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://alpha.gnu.org/gnu/grub/
 
@@ -17,7 +17,7 @@ USE_GMAKE=	yes
 CONFIGURE_TARGET=	${MACHINE_ARCH}-freebsd-freebsd${OSREL}
 
 MAN1=		mbchk.1
-MAN8=		grub.8 grub-install.8
+MAN8=		grub.8 grub-install.8 grub-md5-crypt.8
 
 pre-build:
 	@${RM} ${WRKSRC}/docs/grub.info*
diff --git a/sysutils/grub/distinfo b/sysutils/grub/distinfo
index 6b66cfadf72c..5c3eee5896fc 100644
--- a/sysutils/grub/distinfo
+++ b/sysutils/grub/distinfo
@@ -1 +1 @@
-MD5 (grub-0.5.96.tar.gz) = 4e9785e4b5b131d928881e3fdebd3a09
+MD5 (grub-0.90.tar.gz) = e435d871e5d06b3106342d880380605e
diff --git a/sysutils/grub/files/patch-aa b/sysutils/grub/files/patch-aa
deleted file mode 100644
index acb1b350d8ff..000000000000
--- a/sysutils/grub/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- grub/asmstub.c.orig	Wed Jan 24 11:34:06 2001
-+++ grub/asmstub.c	Wed Jan 24 11:34:15 2001
-@@ -983,7 +983,7 @@
-     close (serial_fd);
-   
-   /* Open the device file.  */
--  serial_fd = open (serial_device, O_RDWR | O_NOCTTY | O_SYNC);
-+  serial_fd = open (serial_device, O_RDWR | O_NOCTTY | O_FSYNC);
-   if (serial_fd < 0)
-     return 0;
- 
diff --git a/sysutils/grub/files/patch-dosc_Makefile.in b/sysutils/grub/files/patch-dosc_Makefile.in
index ff9c5555eda2..8257deb6bff6 100644
--- a/sysutils/grub/files/patch-dosc_Makefile.in
+++ b/sysutils/grub/files/patch-dosc_Makefile.in
@@ -1,11 +1,11 @@
---- docs/Makefile.in.orig	Sat Oct 13 23:57:29 2001
-+++ docs/Makefile.in	Sat Oct 13 23:57:47 2001
-@@ -71,7 +71,7 @@
- GRUB_CFLAGS = @GRUB_CFLAGS@
- GRUB_LIBS = @GRUB_LIBS@
- MAINT = @MAINT@
+--- docs/Makefile.in.orig	Thu Jul  5 07:29:56 2001
++++ docs/Makefile.in	Wed Oct 24 09:09:39 2001
+@@ -248,7 +248,7 @@
+ 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
+ 	$(TEXI2DVI) $<
+ 
 -MAKEINFO = @MAKEINFO@
 +MAKEINFO = @MAKEINFO@ --no-split
- NETBOOT_DRIVERS = @NETBOOT_DRIVERS@
- NET_CFLAGS = @NET_CFLAGS@
- NET_EXTRAFLAGS = @NET_EXTRAFLAGS@
+ TEXI2DVI = texi2dvi
+ DVIPS = dvips
+ .dvi.ps:
diff --git a/sysutils/grub/pkg-plist b/sysutils/grub/pkg-plist
index b925619ffc38..803e68263b73 100644
--- a/sysutils/grub/pkg-plist
+++ b/sysutils/grub/pkg-plist
@@ -7,6 +7,7 @@ info/multiboot.info
 @exec install-info %D/info/grub.info %D/info/dir
 sbin/grub
 sbin/grub-install
+sbin/grub-md5-crypt
 share/grub/i386-freebsd/e2fs_stage1_5
 share/grub/i386-freebsd/fat_stage1_5
 share/grub/i386-freebsd/ffs_stage1_5
@@ -14,5 +15,6 @@ share/grub/i386-freebsd/minix_stage1_5
 share/grub/i386-freebsd/reiserfs_stage1_5
 share/grub/i386-freebsd/stage1
 share/grub/i386-freebsd/stage2
+share/grub/i386-freebsd/vstafs_stage1_5
 @dirrm share/grub/i386-freebsd
-@dirrm share/grub 
+@dirrm share/grub