diff --git a/asterisk.spec b/asterisk.spec
index d648f28..c1736a1 100644
--- a/asterisk.spec
+++ b/asterisk.spec
@@ -170,7 +170,6 @@ BuildRequires:    libss7-devel >= 1.0.1
 BuildRequires:    spandsp-devel >= 0.0.5-0.1.pre4
 BuildRequires:    libtiff-devel
 BuildRequires:    libjpeg-devel
-BuildRequires:    iksemel-devel
 BuildRequires:    lua-devel
 %if 0%{?jack}
 BuildRequires:    jack-audio-connection-kit-devel
@@ -652,6 +651,7 @@ Conflicts: asterisk-voicemail-odbc <= %{version}-%{release}
 Voicemail implementation for Asterisk that stores voicemail on the
 local filesystem.
 
+%if 0%{?fedora} <= 28 || 0%{?rhel} <= 7
 %package xmpp
 Summary: Jabber/XMPP resources for Asterisk
 Group: Applications/Internet
@@ -661,6 +661,7 @@ Conflicts: asterisk-jabber < 13.0.0
 
 %description xmpp
 Jabber/XMPP resources for Asterisk.
+%endif
 
 %prep
 gpgv2 --keyring %{SOURCE7} %{SOURCE1} %{SOURCE0}
@@ -924,6 +925,11 @@ rm -f %{buildroot}%{_sysconfdir}/asterisk/res_corosync.conf
 rm -f %{buildroot}%{_sysconfdir}/asterisk/phone.conf
 %endif
 
+%if ! 0%{fedora}<=28
+rm -f %{buildroot}%{_sysconfdir}/asterisk/motif.conf
+rm -f %{buildroot}%{_sysconfdir}/asterisk/xmpp.conf
+%endif
+
 %pre
 %{_sbindir}/groupadd -r asterisk &>/dev/null || :
 %{_sbindir}/useradd  -r -s /sbin/nologin -d /var/lib/asterisk -M \
@@ -1372,7 +1378,6 @@ fi
 %{_libdir}/asterisk/modules/res_calendar.so
 %{_libdir}/asterisk/modules/res_calendar_caldav.so
 %{_libdir}/asterisk/modules/res_calendar_ews.so
-%{_libdir}/asterisk/modules/res_calendar_exchange.so
 %{_libdir}/asterisk/modules/res_calendar_icalendar.so
 
 %if 0%{?corosync}
@@ -1658,14 +1663,16 @@ fi
 %{_libdir}/asterisk/modules/app_directory_plain.so
 %{_libdir}/asterisk/modules/app_voicemail_plain.so
 
+%if 0%{?fedora} <= 28
 %files xmpp
 %attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/motif.conf
 %attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/xmpp.conf
 %{_libdir}/asterisk/modules/chan_motif.so
 %{_libdir}/asterisk/modules/res_xmpp.so
+%endif
 
 %changelog
-* Thu Jul 12 2018 Jared K. Smith <jsmith@fedoraproject.org> - 15.5.015.5.0-11
+* Thu Jul 12 2018 Jared K. Smith <jsmith@fedoraproject.org> - 15.5.0-1
 - Update to upstream 15.5.0 release for security and bug fixes
 
 * Fri Jun 29 2018 Jitka Plesnikova <jplesnik@redhat.com> - 15.4.1-2
diff --git a/menuselect.makeopts b/menuselect.makeopts
index fe04acb..8e86a81 100644
--- a/menuselect.makeopts
+++ b/menuselect.makeopts
@@ -4,7 +4,7 @@ MENUSELECT_BRIDGES=
 MENUSELECT_CDR=cdr_sqlite
 MENUSELECT_CEL=cel_radius
 MENUSELECT_CFLAGS=LOADABLE_MODULES
-MENUSELECT_CHANNELS=chan_nbs chan_vpb chan_phone
+MENUSELECT_CHANNELS=chan_nbs chan_vpb chan_phone chan_motif
 MENUSELECT_CODECS=codec_opus codec_silk codec_siren7 codec_siren14 codec_g729a codec_codec2
 MENUSELECT_CORE_SOUNDS=
 MENUSELECT_EMBED=
@@ -14,7 +14,7 @@ MENUSELECT_FUNCS=
 MENUSELECT_MOH=
 MENUSELECT_OPTS_app_voicemail=FILE_STORAGE
 MENUSELECT_PBX=
-MENUSELECT_RES=res_config_sqlite res_timing_kqueue res_stasis_test res_mwi_external res_mwi_external_ami res_stasis_mailbox res_ari_mailboxes res_digium_phone
+MENUSELECT_RES=res_config_sqlite res_timing_kqueue res_stasis_test res_mwi_external res_mwi_external_ami res_stasis_mailbox res_ari_mailboxes res_digium_phone res_xmpp res_calendar_exchange
 MENUSELECT_TESTS=test_skel test_heap test_sched test_astobj2 test_dlinklists test_acl test_aoc test_app test_ast_format_str_reduce test_devicestate test_event test_func_file test_gosub test_named_lock test_pbx test_stringfields test_strings test_substitution test_time test_utils test_amihooks test_locale test_logger test_security_events test_poll test_expr test_netsock2 test_db test_linkedlists test_config test_voicemail_api test_jitterbuf test_abstract_jb test_astobj2_thrash test_hashtab_thrash test_xml_escape test_callerid test_ari test_ari_model test_bucket test_cdr test_cel test_channel_feature_hooks test_core_codec test_core_format test_endpoints test_format_cache test_format_cap test_json test_message test_optional_api test_res_pjsip_scheduler test_res_stasis test_scoped_lock test_sorcery test_sorcery_astdb test_sorcery_realtime test_stasis test_stasis_channels test_stasis_endpoints test_taskprocessor test_threadpool test_uri test_uuid test_websocket_client test_vector test_sorcery_memory_cache_thrash test_astobj2_weaken test_dns test_dns_naptr test_dns_query_set test_dns_recurring test_dns_srv test_file test_http_media_cache test_media_cache test_bridging test_channel test_conversions test_sdp test_stream test_data_buffer
 MENUSELECT_UTILS=aelparse astcanary astdb2sqlite3 astman check_expr check_expr2 conf2ael muted smsq stereorize streamplayer
 MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_osplookup