diff --git a/mail/roundcube-carddav/Makefile b/mail/roundcube-carddav/Makefile
index d1a04fd28dbc..f7716547aebb 100644
--- a/mail/roundcube-carddav/Makefile
+++ b/mail/roundcube-carddav/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	carddav
 PORTVERSION=	3.0.3
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	https://github.com/blind-coder/rcmcarddav/releases/download/v${PORTVERSION}/
 PKGNAMEPREFIX=	roundcube-
diff --git a/mail/roundcube-carddav/files/patch-carddav.php b/mail/roundcube-carddav/files/patch-carddav.php
new file mode 100644
index 000000000000..0d54fb72eaf2
--- /dev/null
+++ b/mail/roundcube-carddav/files/patch-carddav.php
@@ -0,0 +1,20 @@
+--- carddav.php.orig	2020-12-10 08:52:54 UTC
++++ carddav.php
+@@ -349,8 +349,15 @@ class carddav extends rcube_plugin
+ 
+ 		if (self::no_override('username', $abook, $prefs)) {
+ 			// %V parses username for macosx, replaces periods and @ by _, work around bugs in contacts.app
+-			$content_username = $abook['username'] === '%V' ? str_replace('@','_', str_replace('.','_',$_SESSION['username'])) : $abook['username'] === '%u' ? $_SESSION['username'] : $abook['username'] === '%l' ? $rcmail->user->get_username('local') : $abook['username'];
+-
++			if ($abook['username'] === '%V') {
++				$content_username = str_replace('@','_', str_replace('.','_',$_SESSION['username']));
++			} elseif ($abook['username'] === '%u') {
++				$content_username = $_SESSION['username'];
++			} elseif ($abook['username'] === '%l') {
++				$content_username = $rcmail->user->get_username('local');
++			} else {
++				$content_username = $abook['username'];
++			}
+ 		} else {
+ 			// input box for username
+ 			$input = new html_inputfield(array('name' => $abookid.'_cd_username', 'type' => 'text', 'autocomplete' => 'off', 'value' => $abook['username']));