diff --git a/mail/getmail6/Makefile b/mail/getmail6/Makefile
index b6c32e237e79..2e1784cf37c5 100644
--- a/mail/getmail6/Makefile
+++ b/mail/getmail6/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	getmail6
 DISTVERSIONPREFIX=	v
 DISTVERSION=	6.18
+PORTREVISION=	1
 CATEGORIES=	mail python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
diff --git a/mail/getmail6/files/patch-getmail b/mail/getmail6/files/patch-getmail
new file mode 100644
index 000000000000..a18dbc099350
--- /dev/null
+++ b/mail/getmail6/files/patch-getmail
@@ -0,0 +1,25 @@
+--- getmail.orig	2021-07-06 05:07:30 UTC
++++ getmail
+@@ -671,18 +671,17 @@ No other entry is `Unseen`, i.e. `-s,` means `imap_sea
+                 % (getmaildir_type, getmaildir)
+             )
+ 
+-        _getmaildir = os.path.expanduser(getmaildir)
+-
+         if not options.rcfile:
+             if not os.path.exists(
+-                os.path.join(_getmaildir,defaults['rcfile'])):
+-                options.rcfile = os.listdir(_getmaildir)
++                os.path.join(getmaildir,defaults['rcfile'])):
++                options.rcfile = [x for x in os.listdir(getmaildir)
++                                  if not x.startswith('oldmail-')]
+             else:
+                 options.rcfile.append(defaults['rcfile'])
+ 
+         configs = []
+         for filename in options.rcfile:
+-            path = os.path.join(_getmaildir,filename)
++            path = os.path.join(getmaildir,filename)
+             log.debug('processing rcfile %s\n' % path)
+             if not os.path.exists(path):
+                 raise getmailOperationError('configuration file %s does '