diff --git a/mail/grepmail/Makefile b/mail/grepmail/Makefile
index f60b0b6bcb2..db3bbb5ad1f 100644
--- a/mail/grepmail/Makefile
+++ b/mail/grepmail/Makefile
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.2 2001/06/04 19:23:30 shell Exp $
-# vim:ts=8
+# $OpenBSD: Makefile,v 1.3 2001/09/11 01:51:09 jcs Exp $
 
-DISTNAME=	grepmail-4.47
+DISTNAME=	grepmail-4.51
 CATEGORIES=	mail perl5
-NEED_VERSION=	1.405
+NEED_VERSION=	1.454
 
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
diff --git a/mail/grepmail/files/md5 b/mail/grepmail/files/md5
index 286efce1f29..c32e348ae59 100644
--- a/mail/grepmail/files/md5
+++ b/mail/grepmail/files/md5
@@ -1,3 +1,3 @@
-MD5 (grepmail-4.47.tar.gz) = f42f36ee222e6c323608ea8a87b00b88
-RMD160 (grepmail-4.47.tar.gz) = 26510ac7d30a1a195b99bd09867f9ccf23626f4c
-SHA1 (grepmail-4.47.tar.gz) = dffe9a618908be28864378226a990fb02c7ced6d
+MD5 (grepmail-4.51.tar.gz) = f230b763bdddd4ca6be1eabba217acf9
+RMD160 (grepmail-4.51.tar.gz) = 5cdb02d5123ab96ce40c8a1b1faebc8dfc329c95
+SHA1 (grepmail-4.51.tar.gz) = 9ac39ddb1562ffefb13d05f3d820a34d711134f0
diff --git a/mail/grepmail/patches/patch-MANIFEST b/mail/grepmail/patches/patch-MANIFEST
new file mode 100644
index 00000000000..d0d717c1ff3
--- /dev/null
+++ b/mail/grepmail/patches/patch-MANIFEST
@@ -0,0 +1,16 @@
+$OpenBSD: patch-MANIFEST,v 1.1 2001/09/11 01:51:09 jcs Exp $
+--- MANIFEST.orig	Mon Sep 10 20:35:48 2001
++++ MANIFEST	Mon Sep 10 20:35:55 2001
+@@ -4,12 +4,6 @@
+ CHANGES                               A change history
+ LICENSE                               A copy of the license
+ Makefile.PL                           Makes the makefile
+-FastReader/Makefile.PL                FastReader Makefile.PL
+-FastReader/FastReader.pm              FastReader stub .pm file
+-FastReader/Changes                    FastReader changelog
+-FastReader/MANIFEST                   FastReader MANIFEST
+-FastReader/t/simple.t                 FastReader Perl test program
+-FastReader/t/mailarc-1.txt            FastReader input file
+ t/functionality.t                     A test of the script's correctness
+ t/gnus.txt                            Input file
+ t/mailarc-1.txt                       Input file
diff --git a/mail/grepmail/patches/patch-Makefile_PL b/mail/grepmail/patches/patch-Makefile_PL
new file mode 100644
index 00000000000..ec62099fe1c
--- /dev/null
+++ b/mail/grepmail/patches/patch-Makefile_PL
@@ -0,0 +1,25 @@
+$OpenBSD: patch-Makefile_PL,v 1.1 2001/09/11 01:51:09 jcs Exp $
+--- Makefile.PL.orig	Sun Sep  9 11:00:59 2001
++++ Makefile.PL	Mon Sep 10 20:25:49 2001
+@@ -6,10 +6,7 @@
+ 
+ require 5.004;
+ 
+-die "You don't need to specify options on the command line.\n"
+-  if $ARGV[0] =~ /^\w+=/;
+-
+-my $use_fastreader = 1;
++my $use_fastreader = 0;
+ 
+ unless (@ARGV)
+ {
+@@ -26,8 +23,7 @@
+ {
+   my $VERSION = shift;
+ 
+-  my ($install_type,$use_fastreader,$prefix) =
+-      Get_Unix_Install_Info();
++  my ($install_type,$use_fastreader,$prefix) = ('system', 0, 0);
+ 
+   unless ($install_type eq 'system')
+   {
diff --git a/mail/grepmail/pkg/PLIST b/mail/grepmail/pkg/PLIST
index d7ba659df0b..dbc3fac18e8 100644
--- a/mail/grepmail/pkg/PLIST
+++ b/mail/grepmail/pkg/PLIST
@@ -1,12 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.2 2001/06/04 19:23:30 shell Exp $
+@comment $OpenBSD: PLIST,v 1.3 2001/09/11 01:51:09 jcs Exp $
 bin/grepmail
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Mail/Folder/FastReader.pm
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Mail/Folder/FastReader/FastReader.bs
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Mail/Folder/FastReader/FastReader.so
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Mail/Folder/FastReader/autosplit.ix
 man/man1/grepmail.1
-man/man3/Mail::Folder::FastReader.3p
-@dirrm libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/grepmail
-@dirrm libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Mail/Folder/FastReader
-@dirrm libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Mail/Folder
-@dirrm libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Mail/Folder