diff --git a/mail/horde-imp/Makefile b/mail/horde-imp/Makefile
index f2cd26c90976..897a035c0b65 100644
--- a/mail/horde-imp/Makefile
+++ b/mail/horde-imp/Makefile
@@ -1,56 +1,57 @@
 PORTNAME=	imp
 PORTVERSION=	6.2.27
+PORTREVISION=	1
 CATEGORIES=	mail www pear
 PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}horde-
 
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde web based webmail system
 WWW=		https://www.horde.org/apps/imp/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		horde cpe
 USE_HORDE_BUILD=	Horde_Role
 USE_HORDE_RUN=	Horde_Role \
 		horde \
 		Horde_Auth \
 		Horde_Browser \
 		Horde_Cache \
 		Horde_Compress \
 		Horde_Core \
 		Horde_Crypt \
 		Horde_Css_Parser \
 		Horde_Date \
 		Horde_Editor \
 		Horde_Exception \
 		Horde_Icalendar \
 		Horde_Image \
 		Horde_Imap_Client \
 		Horde_Itip \
 		Horde_ListHeaders \
 		Horde_LoginTasks \
 		Horde_Mail \
 		Horde_Mail_Autoconfig \
 		Horde_Mime \
 		Horde_Mime_Viewer \
 		Horde_Nls \
 		Horde_Notification \
 		Horde_Pack \
 		Horde_Perms \
 		Horde_SpellChecker \
 		Horde_Stream \
 		Horde_Stream_Filter \
 		Horde_Stream_Wrapper \
 		Horde_Support \
 		Horde_Text_Filter \
 		Horde_Text_Flowed \
 		Horde_Tree \
 		Horde_Url \
 		Horde_Util \
 		Horde_Vfs \
 		Horde_View
 
 CONFLICTS_INSTALL=	php*-horde-imp
 
 .include <bsd.port.mk>
diff --git a/mail/horde-imp/files/patch-config_prefs.php b/mail/horde-imp/files/patch-config_prefs.php
index de8a319f1870..e355424286ca 100644
--- a/mail/horde-imp/files/patch-config_prefs.php
+++ b/mail/horde-imp/files/patch-config_prefs.php
@@ -1,11 +1,11 @@
---- config/prefs.php.orig	2011-05-03 06:27:23.000000000 -0800
-+++ config/prefs.php	2011-05-07 10:06:10.000000000 -0800
-@@ -1200,7 +1200,7 @@
+--- config/prefs.php.orig	2020-08-27 19:34:20 UTC
++++ config/prefs.php
+@@ -930,7 +930,7 @@ $_prefs['sourceselect'] = array(
  // You can provide default values this way:
  //   'value' => json_encode(array('source_one', 'source_two'))
  $_prefs['search_sources'] = array(
 -    'value' => ''
 +    'value' => 'localsql',
  );
  
  // Field(s) to use when expanding addresses
diff --git a/mail/horde-imp/files/patch-lib_Prefs_Sort.php b/mail/horde-imp/files/patch-lib_Prefs_Sort.php
new file mode 100644
index 000000000000..c9ffce90eab1
--- /dev/null
+++ b/mail/horde-imp/files/patch-lib_Prefs_Sort.php
@@ -0,0 +1,19 @@
+--- lib/Prefs/Sort.php.orig	2020-08-27 19:34:20 UTC
++++ lib/Prefs/Sort.php
+@@ -39,9 +39,13 @@ class IMP_Prefs_Sort implements ArrayAccess, IteratorA
+     {
+         global $prefs;
+ 
+-        $sortpref = @unserialize($prefs->getValue(self::SORTPREF));
+-        if (is_array($sortpref)) {
+-            $this->_sortpref = $sortpref;
++        $serializedPref = $prefs->getValue(self::SORTPREF);
++        // Only unserialize non-empty strings. Disallow yielding any classes.
++        if (!empty($serializedPref && is_string($serializedPref))) {
++            $sortpref = @unserialize($serializedPref, ['allowed_classes' => false]);
++            if (is_array($sortpref)) {
++                $this->_sortpref = $sortpref;
++            }
+         }
+     }
+