diff --git a/devel/pear-Horde_Core/Makefile b/devel/pear-Horde_Core/Makefile
index fa7519349b3f..1ab59677b3e7 100644
--- a/devel/pear-Horde_Core/Makefile
+++ b/devel/pear-Horde_Core/Makefile
@@ -1,71 +1,72 @@
 PORTNAME=	Horde_Core
 DISTVERSION=	2.31.16
+PORTREVISION=	1
 CATEGORIES=	devel www pear
 
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde Core Framework libraries
 WWW=		https://pear.horde.org
 
 CONFLICTS=	horde-3*
 
 OPTIONS_DEFINE=	KOLAB LZF SOCKETS
 KOLAB_DESC=	Enable Kolab server support
 LZF_DESC=	Depend on lzf PHP extension
 SOCKETS_DESC=	Depend on sockets PHP extension
 
 USES=		horde php cpe
 USE_PHP=	session
 
 USE_HORDE_BUILD=	Horde_Role
 
 USE_HORDE_RUN=	Horde_Role \
 		Horde_ActiveSync \
 		Horde_Alarm \
 		Horde_Auth \
 		Horde_Autoloader \
 		Horde_Browser \
 		Horde_Cache \
 		Horde_Cli \
 		Horde_Compress \
 		Horde_Compress_Fast \
 		Horde_Controller \
 		Horde_Css_Parser \
 		Horde_CssMinify \
 		Horde_Data \
 		Horde_Date \
 		Horde_Exception \
 		Horde_Group \
 		Horde_History \
 		Horde_Injector \
 		Horde_JavascriptMinify \
 		Horde_Lock \
 		Horde_Log \
 		Horde_LoginTasks \
 		Horde_Mime \
 		Horde_Mime_Viewer \
 		Horde_Notification \
 		Horde_Pack \
 		Horde_Perms \
 		Horde_Prefs \
 		Horde_Secret \
 		Horde_Serialize \
 		Horde_SessionHandler \
 		Horde_Share \
 		Horde_Smtp \
 		Horde_Support \
 		Horde_Template \
 		Horde_Token \
 		Horde_Text_Filter \
 		Horde_Translation \
 		Horde_Url \
 		Horde_Util \
 		Horde_View
 
 # Not required but wanted
 USE_HORDE_RUN+=	Horde_Routes
 
 KOLAB_USE=	HORDE_RUN=Horde_Kolab_Server,Horde_Kolab_Session,Horde_Kolab_Storage
 LZF_RUN_DEPENDS=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/lzf.so:archivers/pecl-lzf@${PHP_FLAVOR}
 SOCKETS_USE=	PHP=sockets
 
 .include <bsd.port.mk>
diff --git a/devel/pear-Horde_Core/files/patch-lib_Horde_Themes_Element.php b/devel/pear-Horde_Core/files/patch-lib_Horde_Themes_Element.php
new file mode 100644
index 000000000000..93c45741b580
--- /dev/null
+++ b/devel/pear-Horde_Core/files/patch-lib_Horde_Themes_Element.php
@@ -0,0 +1,11 @@
+--- lib/Horde/Themes/Element.php.orig	2020-09-06 03:24:25 UTC
++++ lib/Horde/Themes/Element.php
+@@ -143,7 +143,7 @@ class Horde_Themes_Element
+         switch ($name) {
+         case 'fs':
+         case 'uri':
+-            return $this->_data[$name];
++            return (isset($this->_data[$name])) ? $this->_data[$name] : null;
+ 
+         case 'fulluri':
+             return Horde::url($this->_data['uri'], true);