diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index 13e417b..681e7fc 100644
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -94,6 +94,9 @@ Source91: patch-cassandane-no-syslog
 # Upstream ticket https://github.com/cyrusimap/cyrus-imapd/issues/1995
 Source92: patch-cassandane-fix-annotator
 
+# Change the cassandane base port to avoid issues in koji
+Source93: patch-cassandane-base-port
+
 BuildRequires: autoconf automake bison flex gcc gcc-c++ git groff libtool
 BuildRequires: pkgconfig systemd transfig
 
@@ -228,6 +231,7 @@ tar xf %SOURCE81
 
 patch -p1 < %SOURCE91
 patch -p1 < %SOURCE92
+patch -p1 < %SOURCE93
 
 cp %SOURCE82 cassandane.ini
 # RF rpm-buildroot-usage
@@ -637,6 +641,7 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d /v
 * Tue Apr 03 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.5-11
 - Re-enable imaptest on >= F29.
 - F29's imaptest fixes several bugs, allowing all tests to be run there.
+- Relocate cassandane base port to hopefully work better in koji.
 
 * Mon Apr 02 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.5-10
 - Update cassandane checkout to fix a test that was broken by DST.