diff --git a/mail/mess822/Makefile b/mail/mess822/Makefile
index 45ec7a6ad580..b6ddffb6d068 100644
--- a/mail/mess822/Makefile
+++ b/mail/mess822/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	mess822
 PORTVERSION=	0.58
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	http://cr.yp.to/software/ \
 		ftp://ftp.jp.qmail.org/qmail/ \
@@ -23,5 +23,6 @@ post-patch:
 	@${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
 	@${ECHO_CMD} "${CC} ${STRIP} ${LDFLAGS}" > ${WRKSRC}/conf-ld
 	@${ECHO_CMD} ${STAGEDIR}${PREFIX} > ${WRKSRC}/conf-home
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/man
 
 .include <bsd.port.mk>
diff --git a/mail/mess822/files/patch-hier.c b/mail/mess822/files/patch-hier.c
index a32b04085e24..df8f43790e9f 100644
--- a/mail/mess822/files/patch-hier.c
+++ b/mail/mess822/files/patch-hier.c
@@ -1,73 +1,93 @@
-*** hier.c.orig	Sat Sep  5 04:33:37 1998
---- hier.c	Thu Apr 15 12:55:16 2004
-***************
-*** 2,21 ****
-  
-  void hier()
-  {
-!   h(auto_home,-1,-1,02755);
-  
-!   d(auto_home,"bin",-1,-1,02755);
-!   d(auto_home,"lib",-1,-1,02755);
-!   d(auto_home,"include",-1,-1,02755);
-!   d(auto_home,"man",-1,-1,02755);
-!   d(auto_home,"man/man1",-1,-1,02755);
-!   d(auto_home,"man/man3",-1,-1,02755);
-!   d(auto_home,"man/man5",-1,-1,02755);
-!   d(auto_home,"man/man8",-1,-1,02755);
-!   d(auto_home,"man/cat1",-1,-1,02755);
-!   d(auto_home,"man/cat3",-1,-1,02755);
-!   d(auto_home,"man/cat5",-1,-1,02755);
-!   d(auto_home,"man/cat8",-1,-1,02755);
-  
-    c(auto_home,"lib","mess822.a",-1,-1,0644);
-    c(auto_home,"include","mess822.h",-1,-1,0644);
---- 2,18 ----
-  
-  void hier()
-  {
-!   h(auto_home,-1,-1,0755);
-  
-!   d(auto_home,"bin",-1,-1,0755);
-!   d(auto_home,"lib",-1,-1,0755);
-!   d(auto_home,"include",-1,-1,0755);
-!   d(auto_home,"man",-1,-1,0755);
-!   d(auto_home,"man/man1",-1,-1,0755);
-!   d(auto_home,"man/man3",-1,-1,0755);
-!   d(auto_home,"man/man5",-1,-1,0755);
-!   d(auto_home,"man/man8",-1,-1,0755);
-!   d(auto_home,"etc",-1,-1,0755);
-  
-    c(auto_home,"lib","mess822.a",-1,-1,0644);
-    c(auto_home,"include","mess822.h",-1,-1,0644);
-***************
-*** 48,70 ****
-    c(auto_home,"man/man3","mess822_token.3",-1,-1,0644);
-    c(auto_home,"man/man3","mess822_when.3",-1,-1,0644);
-  
-!   c(auto_home,"man/cat1","iftocc.0",-1,-1,0644);
-!   c(auto_home,"man/cat1","new-inject.0",-1,-1,0644);
-!   c(auto_home,"man/cat1","822field.0",-1,-1,0644);
-!   c(auto_home,"man/cat1","822header.0",-1,-1,0644);
-!   c(auto_home,"man/cat1","822date.0",-1,-1,0644);
-!   c(auto_home,"man/cat1","822received.0",-1,-1,0644);
-!   c(auto_home,"man/cat1","822print.0",-1,-1,0644);
-!   c(auto_home,"man/cat5","rewriting.0",-1,-1,0644);
-!   c(auto_home,"man/cat8","ofmipd.0",-1,-1,0644);
-!   c(auto_home,"man/cat8","ofmipname.0",-1,-1,0644);
-!   c(auto_home,"man/cat3","mess822.0",-1,-1,0644);
-!   c(auto_home,"man/cat3","mess822_addr.0",-1,-1,0644);
-!   c(auto_home,"man/cat3","mess822_date.0",-1,-1,0644);
-!   c(auto_home,"man/cat3","mess822_fold.0",-1,-1,0644);
-!   c(auto_home,"man/cat3","mess822_quote.0",-1,-1,0644);
-!   c(auto_home,"man/cat3","mess822_token.0",-1,-1,0644);
-!   c(auto_home,"man/cat3","mess822_when.0",-1,-1,0644);
-! 
-!   c("/etc",".","leapsecs.dat",-1,-1,0644);
-  }
---- 45,49 ----
-    c(auto_home,"man/man3","mess822_token.3",-1,-1,0644);
-    c(auto_home,"man/man3","mess822_when.3",-1,-1,0644);
-  
-!   c(auto_home,"etc","leapsecs.dat",-1,-1,0644);
-  }
+--- hier.c.orig	1998-09-05 02:33:37 UTC
++++ hier.c
+@@ -2,20 +2,17 @@ void hier()
+ 
+ void hier()
+ {
+-  h(auto_home,-1,-1,02755);
++  h(auto_home,-1,-1,0755);
+ 
+-  d(auto_home,"bin",-1,-1,02755);
+-  d(auto_home,"lib",-1,-1,02755);
+-  d(auto_home,"include",-1,-1,02755);
+-  d(auto_home,"man",-1,-1,02755);
+-  d(auto_home,"man/man1",-1,-1,02755);
+-  d(auto_home,"man/man3",-1,-1,02755);
+-  d(auto_home,"man/man5",-1,-1,02755);
+-  d(auto_home,"man/man8",-1,-1,02755);
+-  d(auto_home,"man/cat1",-1,-1,02755);
+-  d(auto_home,"man/cat3",-1,-1,02755);
+-  d(auto_home,"man/cat5",-1,-1,02755);
+-  d(auto_home,"man/cat8",-1,-1,02755);
++  d(auto_home,"bin",-1,-1,0755);
++  d(auto_home,"lib",-1,-1,0755);
++  d(auto_home,"include",-1,-1,0755);
++  d(auto_home,"share/man",-1,-1,0755);
++  d(auto_home,"share/man/man1",-1,-1,0755);
++  d(auto_home,"share/man/man3",-1,-1,0755);
++  d(auto_home,"share/man/man5",-1,-1,0755);
++  d(auto_home,"share/man/man8",-1,-1,0755);
++  d(auto_home,"etc",-1,-1,0755);
+ 
+   c(auto_home,"lib","mess822.a",-1,-1,0644);
+   c(auto_home,"include","mess822.h",-1,-1,0644);
+@@ -30,41 +27,23 @@ void hier()
+   c(auto_home,"bin","822received",-1,-1,0755);
+   c(auto_home,"bin","822print",-1,-1,0755);
+ 
+-  c(auto_home,"man/man1","iftocc.1",-1,-1,0644);
+-  c(auto_home,"man/man1","new-inject.1",-1,-1,0644);
+-  c(auto_home,"man/man1","822field.1",-1,-1,0644);
+-  c(auto_home,"man/man1","822header.1",-1,-1,0644);
+-  c(auto_home,"man/man1","822date.1",-1,-1,0644);
+-  c(auto_home,"man/man1","822received.1",-1,-1,0644);
+-  c(auto_home,"man/man1","822print.1",-1,-1,0644);
+-  c(auto_home,"man/man5","rewriting.5",-1,-1,0644);
+-  c(auto_home,"man/man8","ofmipd.8",-1,-1,0644);
+-  c(auto_home,"man/man8","ofmipname.8",-1,-1,0644);
+-  c(auto_home,"man/man3","mess822.3",-1,-1,0644);
+-  c(auto_home,"man/man3","mess822_addr.3",-1,-1,0644);
+-  c(auto_home,"man/man3","mess822_date.3",-1,-1,0644);
+-  c(auto_home,"man/man3","mess822_fold.3",-1,-1,0644);
+-  c(auto_home,"man/man3","mess822_quote.3",-1,-1,0644);
+-  c(auto_home,"man/man3","mess822_token.3",-1,-1,0644);
+-  c(auto_home,"man/man3","mess822_when.3",-1,-1,0644);
++  c(auto_home,"share/man/man1","iftocc.1",-1,-1,0644);
++  c(auto_home,"share/man/man1","new-inject.1",-1,-1,0644);
++  c(auto_home,"share/man/man1","822field.1",-1,-1,0644);
++  c(auto_home,"share/man/man1","822header.1",-1,-1,0644);
++  c(auto_home,"share/man/man1","822date.1",-1,-1,0644);
++  c(auto_home,"share/man/man1","822received.1",-1,-1,0644);
++  c(auto_home,"share/man/man1","822print.1",-1,-1,0644);
++  c(auto_home,"share/man/man5","rewriting.5",-1,-1,0644);
++  c(auto_home,"share/man/man8","ofmipd.8",-1,-1,0644);
++  c(auto_home,"share/man/man8","ofmipname.8",-1,-1,0644);
++  c(auto_home,"share/man/man3","mess822.3",-1,-1,0644);
++  c(auto_home,"share/man/man3","mess822_addr.3",-1,-1,0644);
++  c(auto_home,"share/man/man3","mess822_date.3",-1,-1,0644);
++  c(auto_home,"share/man/man3","mess822_fold.3",-1,-1,0644);
++  c(auto_home,"share/man/man3","mess822_quote.3",-1,-1,0644);
++  c(auto_home,"share/man/man3","mess822_token.3",-1,-1,0644);
++  c(auto_home,"share/man/man3","mess822_when.3",-1,-1,0644);
+ 
+-  c(auto_home,"man/cat1","iftocc.0",-1,-1,0644);
+-  c(auto_home,"man/cat1","new-inject.0",-1,-1,0644);
+-  c(auto_home,"man/cat1","822field.0",-1,-1,0644);
+-  c(auto_home,"man/cat1","822header.0",-1,-1,0644);
+-  c(auto_home,"man/cat1","822date.0",-1,-1,0644);
+-  c(auto_home,"man/cat1","822received.0",-1,-1,0644);
+-  c(auto_home,"man/cat1","822print.0",-1,-1,0644);
+-  c(auto_home,"man/cat5","rewriting.0",-1,-1,0644);
+-  c(auto_home,"man/cat8","ofmipd.0",-1,-1,0644);
+-  c(auto_home,"man/cat8","ofmipname.0",-1,-1,0644);
+-  c(auto_home,"man/cat3","mess822.0",-1,-1,0644);
+-  c(auto_home,"man/cat3","mess822_addr.0",-1,-1,0644);
+-  c(auto_home,"man/cat3","mess822_date.0",-1,-1,0644);
+-  c(auto_home,"man/cat3","mess822_fold.0",-1,-1,0644);
+-  c(auto_home,"man/cat3","mess822_quote.0",-1,-1,0644);
+-  c(auto_home,"man/cat3","mess822_token.0",-1,-1,0644);
+-  c(auto_home,"man/cat3","mess822_when.0",-1,-1,0644);
+-
+-  c("/etc",".","leapsecs.dat",-1,-1,0644);
++  c(auto_home,"etc","leapsecs.dat",-1,-1,0644);
+ }
diff --git a/mail/mess822/pkg-plist b/mail/mess822/pkg-plist
index 4798d659526f..fc877239bb01 100644
--- a/mail/mess822/pkg-plist
+++ b/mail/mess822/pkg-plist
@@ -10,20 +10,20 @@ bin/822received
 bin/822print
 include/mess822.h
 etc/leapsecs.dat
-man/man1/822date.1.gz
-man/man1/822field.1.gz
-man/man1/822header.1.gz
-man/man1/822print.1.gz
-man/man1/822received.1.gz
-man/man1/iftocc.1.gz
-man/man1/new-inject.1.gz
-man/man3/mess822.3.gz
-man/man3/mess822_addr.3.gz
-man/man3/mess822_date.3.gz
-man/man3/mess822_fold.3.gz
-man/man3/mess822_quote.3.gz
-man/man3/mess822_token.3.gz
-man/man3/mess822_when.3.gz
-man/man5/rewriting.5.gz
-man/man8/ofmipd.8.gz
-man/man8/ofmipname.8.gz
+share/man/man1/822date.1.gz
+share/man/man1/822field.1.gz
+share/man/man1/822header.1.gz
+share/man/man1/822print.1.gz
+share/man/man1/822received.1.gz
+share/man/man1/iftocc.1.gz
+share/man/man1/new-inject.1.gz
+share/man/man3/mess822.3.gz
+share/man/man3/mess822_addr.3.gz
+share/man/man3/mess822_date.3.gz
+share/man/man3/mess822_fold.3.gz
+share/man/man3/mess822_quote.3.gz
+share/man/man3/mess822_token.3.gz
+share/man/man3/mess822_when.3.gz
+share/man/man5/rewriting.5.gz
+share/man/man8/ofmipd.8.gz
+share/man/man8/ofmipname.8.gz