diff --git a/mail/procmail/Makefile b/mail/procmail/Makefile
index 38e8d805099b..8f0e10a129a5 100644
--- a/mail/procmail/Makefile
+++ b/mail/procmail/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	procmail
-PORTVERSION=    3.22
-PORTREVISION=   4
+PORTVERSION=	3.22
+PORTREVISION=	5
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.procmail.org/pub/procmail/ \
 		ftp://ftp.psg.com/pub/unix/procmail/ \
diff --git a/mail/procmail/files/patch-aj b/mail/procmail/files/patch-aj
new file mode 100644
index 000000000000..02d3e9a9ba74
--- /dev/null
+++ b/mail/procmail/files/patch-aj
@@ -0,0 +1,11 @@
+--- src/comsat.c.orig	Tue Sep 11 08:55:46 2001
++++ src/comsat.c	Wed Nov 17 09:44:12 2004
+@@ -120,7 +120,7 @@
+ { int s;const char*p;
+   if(!csvalid||!buf)		  /* is comat on and set to a valid address? */
+      return;
+-  if(!*cslgname||strlen(cslgname)+2>linebuf)	       /* is $LOGNAME bogus? */
++  if(!cslgname||!*cslgname||strlen(cslgname)+2>linebuf)	       /* is $LOGNAME bogus? */
+      return;
+   if(!(p=folder?folder:cslastf))		     /* do we have a folder? */
+      return;