diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index 7045d4c..0e5db5e 100644
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -1,6 +1,6 @@
 Name: cyrus-imapd
 Version: 2.5.10
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %define ssl_pem_file /etc/pki/%name/%name.pem
 
@@ -267,6 +267,9 @@ mv %buildroot/%_mandir/man8/fetchnews.8 %buildroot/%_mandir/man8/cyrfetchnews.8
 perl -pi -e 's|fetchnews|cyrfetchnews|g;s|Fetchnews|Cyrfetchnews|g;s/FETCHNEWS/CYRFETCHNEWS/g' \
     %{buildroot}%{_mandir}/man8/cyrfetchnews.8
 
+# Rename 'httpd' manpage to avoid clash with Apache
+mv %buildroot/%_mandir/man8/httpd.8 %buildroot/%_mandir/man8/cyrhttpd.8
+
 #remove executable bit from docs
 for ddir in doc perl/imap/examples
 do
@@ -364,6 +367,9 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d /v
 %{_mandir}/man1/*
 
 %changelog
+* Mon Jan 09 2017 Jason L Tibbitts III <tibbs@math.uh.edu> - 2.5.10-2
+- Rename httpd manpage to "cyrhttpd" to avoid conflict with the httpd package.
+
 * Wed Nov 23 2016 Jason L Tibbitts III <tibbs@math.uh.edu> - 2.5.10-1
 - Initial update to the 2.5 series.
 - Significant spec cleanups.