2 files changed, 15 insertions, 5 deletions

diff --git a/mail/majordomo/files/post-install-notes b/mail/majordomo/files/post-install-notes
index ded8c8baac8b..286a06a54e70 100644
--- a/mail/majordomo/files/post-install-notes
+++ b/mail/majordomo/files/post-install-notes
@@ -38,11 +38,11 @@ manually:
 	  added. The postfix port uses nobody by default, which should be
 	  changed to another user if your users can execute commands as user
 	  nobody (Apache/CGI comes to mind). Postfix does not do initgroups()
-	  properly, so you need to chgrp the wrapper script to the
-	  default_privs user (this may apply for other MTAs as well) for it
-	  to work. It is important that you do this and not just make wrapper
-	  executable for all; you are increasing the chances of it getting
-	  exploited if you do.
+	  properly, so you need to chgrp the wrapper script to the group of
+	  the default_privs user (this may apply for other MTAs as well) for
+	  it to work. It is important that you do this and not just make
+	  wrapper executable for all; you are increasing the chances of it
+	  getting exploited if you do.
 
 Enjoy Majordomo!
 
diff --git a/mail/majordomo/files/postfix-approve-patch b/mail/majordomo/files/postfix-approve-patch
new file mode 100644
index 000000000000..9a648b617532
--- /dev/null
+++ b/mail/majordomo/files/postfix-approve-patch
@@ -0,0 +1,10 @@
+--- approve.orig	Mon Jul 23 01:44:46 2001
++++ approve	Mon Jul 23 01:45:07 2001
+@@ -214,6 +214,7 @@
+ 	    $from_skipped = 1;
+ 	    next;
+ 	}
++	next if /^Delivered-To: /i;
+ 	s/^~/~~/;
+ 	print MAIL $_;
+     }