diff --git a/net-im/prosody-modules/Makefile b/net-im/prosody-modules/Makefile
index 9384514034ac..250f5bf0ed7e 100644
--- a/net-im/prosody-modules/Makefile
+++ b/net-im/prosody-modules/Makefile
@@ -1,15 +1,14 @@
 # $FreeBSD$
 
 PORTNAME=	prosody-modules
-PORTVERSION=	20180216
+PORTVERSION=	20191017
 CATEGORIES=	net-im
-MASTER_SITES=	https://hg.prosody.im/${PORTNAME}/archive/  \
-		LOCAL/tcberner/${PORTNAME}-${PORTVERSION}
-DISTNAME=	6f289283feb1
+MASTER_SITES=	https://hg.prosody.im/${PORTNAME}/archive/
+DISTNAME=	a6db99c1420a
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Prosody modules repository snapshot
+COMMENT=	Prosody Community modules repository snapshot
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
@@ -20,7 +19,7 @@ NO_BUILD=	yes
 SUB_FILES=	pkg-message
 SUB_LIST=	INSTALLPATH=${INSTALLPATH}
 PLIST_SUB=	INSTALLPATH=${INSTALLPATH}
-WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTNAME}
+WRKSRC=		${WRKDIR}/Community-Modules-${DISTNAME}
 INSTALLPATH=	${PREFIX}/lib/${PORTNAME}
 
 OPTIONS_DEFINE=	DOCS
diff --git a/net-im/prosody-modules/distinfo b/net-im/prosody-modules/distinfo
index 404a29594b41..41755ff4edf6 100644
--- a/net-im/prosody-modules/distinfo
+++ b/net-im/prosody-modules/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1519037706
-SHA256 (prosody-modules/6f289283feb1.tar.gz) = d92a36faa8e68af011b8161505dfb366903309dc9f4a365e80be2bd3e39ede91
-SIZE (prosody-modules/6f289283feb1.tar.gz) = 809565
+TIMESTAMP = 1571314775
+SHA256 (prosody-modules/a6db99c1420a.tar.gz) = bd75699e3b356f33f29caed74ae25d9eff165ff7278463a145d3d69167ba3efe
+SIZE (prosody-modules/a6db99c1420a.tar.gz) = 937293
diff --git a/net-im/prosody-modules/pkg-plist b/net-im/prosody-modules/pkg-plist
index 9b6cb7f1f1be..bde5b0a503d3 100644
--- a/net-im/prosody-modules/pkg-plist
+++ b/net-im/prosody-modules/pkg-plist
@@ -8,9 +8,12 @@
 %%INSTALLPATH%%/ldap.lib.lua
 %%INSTALLPATH%%/mamprefs.lib.lua
 %%INSTALLPATH%%/mamprefsxml.lib.lua
+%%INSTALLPATH%%/marks.lib.lua
+%%INSTALLPATH%%/mock.lua
 %%INSTALLPATH%%/mod_addressing.lua
 %%INSTALLPATH%%/mod_adhoc_account_management.lua
 %%INSTALLPATH%%/mod_adhoc_blacklist.lua
+%%INSTALLPATH%%/mod_adhoc_dataforms_demo.lua
 %%INSTALLPATH%%/mod_adhoc_groups.lua
 %%INSTALLPATH%%/mod_admin_blocklist.lua
 %%INSTALLPATH%%/mod_admin_message.lua
@@ -23,16 +26,21 @@
 %%INSTALLPATH%%/mod_auth_external.lua
 %%INSTALLPATH%%/mod_auth_ha1.lua
 %%INSTALLPATH%%/mod_auth_http_async.lua
+%%INSTALLPATH%%/mod_auth_http_cookie.lua
 %%INSTALLPATH%%/mod_auth_internal_yubikey.lua
 %%INSTALLPATH%%/mod_auth_joomla.lua
 %%INSTALLPATH%%/mod_auth_ldap.lua
 %%INSTALLPATH%%/mod_auth_ldap2.lua
+%%INSTALLPATH%%/mod_auth_oauthbearer.lua
 %%INSTALLPATH%%/mod_auth_pam.lua
 %%INSTALLPATH%%/mod_auth_phpbb3.lua
 %%INSTALLPATH%%/mod_auth_sql.lua
+%%INSTALLPATH%%/mod_auth_token.lua
 %%INSTALLPATH%%/mod_auth_wordpress.lua
 %%INSTALLPATH%%/mod_auto_accept_subscriptions.lua
 %%INSTALLPATH%%/mod_auto_activate_hosts.lua
+%%INSTALLPATH%%/mod_auto_answer_disco_info.lua
+%%INSTALLPATH%%/mod_aws_profile.lua
 %%INSTALLPATH%%/mod_benchmark_storage.lua
 %%INSTALLPATH%%/mod_bidi.lua
 %%INSTALLPATH%%/mod_block_outgoing.lua
@@ -42,15 +50,19 @@
 %%INSTALLPATH%%/mod_block_subscribes.lua
 %%INSTALLPATH%%/mod_block_subscriptions.lua
 %%INSTALLPATH%%/mod_blocking.lua
+%%INSTALLPATH%%/mod_bob.lua
+%%INSTALLPATH%%/mod_bookmarks.lua
+%%INSTALLPATH%%/mod_bookmarks2.lua
 %%INSTALLPATH%%/mod_broadcast.lua
 %%INSTALLPATH%%/mod_c2s_conn_throttle.lua
 %%INSTALLPATH%%/mod_c2s_limit_sessions.lua
-%%INSTALLPATH%%/mod_candy.lua
+%%INSTALLPATH%%/mod_cache_c2s_caps.lua
 %%INSTALLPATH%%/mod_carbons.lua
 %%INSTALLPATH%%/mod_carbons_adhoc.lua
 %%INSTALLPATH%%/mod_carbons_copies.lua
 %%INSTALLPATH%%/mod_checkcerts.lua
 %%INSTALLPATH%%/mod_client_certs.lua
+%%INSTALLPATH%%/mod_client_proxy.lua
 %%INSTALLPATH%%/mod_cloud_notify.lua
 %%INSTALLPATH%%/mod_compact_resource.lua
 %%INSTALLPATH%%/mod_compat_bind.lua
@@ -58,6 +70,7 @@
 %%INSTALLPATH%%/mod_compat_muc_admin.lua
 %%INSTALLPATH%%/mod_compat_vcard.lua
 %%INSTALLPATH%%/mod_component_client.lua
+%%INSTALLPATH%%/mod_component_http.lua
 %%INSTALLPATH%%/mod_component_roundrobin.lua
 %%INSTALLPATH%%/mod_compression_unsafe.lua
 %%INSTALLPATH%%/mod_conformance_restricted.lua
@@ -65,12 +78,14 @@
 %%INSTALLPATH%%/mod_csi.lua
 %%INSTALLPATH%%/mod_csi_battery_saver.lua
 %%INSTALLPATH%%/mod_csi_compat.lua
-%%INSTALLPATH%%/mod_csi_pump.lua
+%%INSTALLPATH%%/mod_csi_grace_period.lua
+%%INSTALLPATH%%/mod_csi_muc_priorities.lua
 %%INSTALLPATH%%/mod_data_access.lua
 %%INSTALLPATH%%/mod_default_bookmarks.lua
 %%INSTALLPATH%%/mod_default_vcard.lua
-%%INSTALLPATH%%/mod_delay.lua
 %%INSTALLPATH%%/mod_delegation.lua
+%%INSTALLPATH%%/mod_deny_omemo.lua
+%%INSTALLPATH%%/mod_devices.lua
 %%INSTALLPATH%%/mod_disable_tls.lua
 %%INSTALLPATH%%/mod_discoitems.lua
 %%INSTALLPATH%%/mod_dwd.lua
@@ -78,6 +93,7 @@
 %%INSTALLPATH%%/mod_email_pass.lua
 %%INSTALLPATH%%/mod_extdisco.lua
 %%INSTALLPATH%%/mod_fallback_vcard.lua
+%%INSTALLPATH%%/mod_file_management.lua
 %%INSTALLPATH%%/mod_filter_chatstates.lua
 %%INSTALLPATH%%/mod_filter_words.lua
 %%INSTALLPATH%%/mod_firewall.lua
@@ -89,13 +105,17 @@
 %%INSTALLPATH%%/mod_host_status_check.lua
 %%INSTALLPATH%%/mod_host_status_heartbeat.lua
 %%INSTALLPATH%%/mod_http_altconnect.lua
+%%INSTALLPATH%%/mod_http_auth_check.lua
 %%INSTALLPATH%%/mod_http_authentication.lua
+%%INSTALLPATH%%/mod_http_avatar.lua
+%%INSTALLPATH%%/mod_http_dir_listing2.lua
 %%INSTALLPATH%%/mod_http_favicon.lua
 %%INSTALLPATH%%/mod_http_host_status_check.lua
 %%INSTALLPATH%%/mod_http_hostaliases.lua
 %%INSTALLPATH%%/mod_http_index.lua
 %%INSTALLPATH%%/mod_http_logging.lua
 %%INSTALLPATH%%/mod_http_muc_log.lua
+%%INSTALLPATH%%/mod_http_pep_avatar.lua
 %%INSTALLPATH%%/mod_http_rest.lua
 %%INSTALLPATH%%/mod_http_roster_admin.lua
 %%INSTALLPATH%%/mod_http_stats_stream.lua
@@ -103,6 +123,8 @@
 %%INSTALLPATH%%/mod_http_upload_external.lua
 %%INSTALLPATH%%/mod_http_user_count.lua
 %%INSTALLPATH%%/mod_idlecompat.lua
+%%INSTALLPATH%%/mod_ignore_host_chatstates.lua
+%%INSTALLPATH%%/mod_inject_ecaps2.lua
 %%INSTALLPATH%%/mod_inotify_reload.lua
 %%INSTALLPATH%%/mod_invite.lua
 %%INSTALLPATH%%/mod_ipcheck.lua
@@ -118,6 +140,8 @@
 %%INSTALLPATH%%/mod_listusers.lua
 %%INSTALLPATH%%/mod_log_auth.lua
 %%INSTALLPATH%%/mod_log_events.lua
+%%INSTALLPATH%%/mod_log_events_by_cpu_usage.lua
+%%INSTALLPATH%%/mod_log_events_by_memory.lua
 %%INSTALLPATH%%/mod_log_http.lua
 %%INSTALLPATH%%/mod_log_mark.lua
 %%INSTALLPATH%%/mod_log_messages_sql.lua
@@ -130,32 +154,55 @@
 %%INSTALLPATH%%/mod_mam_muc.lua
 %%INSTALLPATH%%/mod_mamsub.lua
 %%INSTALLPATH%%/mod_manifesto.lua
+%%INSTALLPATH%%/mod_map.lua
+%%INSTALLPATH%%/mod_measure_client_features.lua
+%%INSTALLPATH%%/mod_measure_client_identities.lua
 %%INSTALLPATH%%/mod_measure_client_presence.lua
 %%INSTALLPATH%%/mod_measure_cpu.lua
 %%INSTALLPATH%%/mod_measure_malloc.lua
 %%INSTALLPATH%%/mod_measure_memory.lua
+%%INSTALLPATH%%/mod_measure_message_e2ee.lua
 %%INSTALLPATH%%/mod_measure_message_length.lua
 %%INSTALLPATH%%/mod_measure_stanza_counts.lua
 %%INSTALLPATH%%/mod_measure_storage.lua
 %%INSTALLPATH%%/mod_message_logging.lua
 %%INSTALLPATH%%/mod_migrate.lua
+%%INSTALLPATH%%/mod_minimix.lua
 %%INSTALLPATH%%/mod_motd_sequential.lua
 %%INSTALLPATH%%/mod_muc_access_control.lua
+%%INSTALLPATH%%/mod_muc_badge.lua
 %%INSTALLPATH%%/mod_muc_ban_ip.lua
 %%INSTALLPATH%%/mod_muc_block_pm.lua
+%%INSTALLPATH%%/mod_muc_cloud_notify.lua
 %%INSTALLPATH%%/mod_muc_config_restrict.lua
+%%INSTALLPATH%%/mod_muc_defaults.lua
+%%INSTALLPATH%%/mod_muc_eventsource.lua
+%%INSTALLPATH%%/mod_muc_gc10.lua
+%%INSTALLPATH%%/mod_muc_hide_media.lua
 %%INSTALLPATH%%/mod_muc_intercom.lua
+%%INSTALLPATH%%/mod_muc_lang.lua
 %%INSTALLPATH%%/mod_muc_limits.lua
 %%INSTALLPATH%%/mod_muc_log.lua
+%%INSTALLPATH%%/mod_muc_mam_hints.lua
+%%INSTALLPATH%%/mod_muc_mam_markers.lua
+%%INSTALLPATH%%/mod_muc_media_metadata.lua
+%%INSTALLPATH%%/mod_muc_notifications.lua
+%%INSTALLPATH%%/mod_muc_occupant_id.lua
+%%INSTALLPATH%%/mod_muc_ping.lua
 %%INSTALLPATH%%/mod_muc_restrict_rooms.lua
+%%INSTALLPATH%%/mod_muc_webchat_url.lua
 %%INSTALLPATH%%/mod_munin.lua
 %%INSTALLPATH%%/mod_net_dovecotauth.lua
+%%INSTALLPATH%%/mod_net_proxy.lua
+%%INSTALLPATH%%/mod_nodeinfo2.lua
 %%INSTALLPATH%%/mod_offline_email.lua
+%%INSTALLPATH%%/mod_offline_hints.lua
 %%INSTALLPATH%%/mod_omemo_all_access.lua
 %%INSTALLPATH%%/mod_onhold.lua
 %%INSTALLPATH%%/mod_onions.lua
 %%INSTALLPATH%%/mod_openid.lua
 %%INSTALLPATH%%/mod_password_policy.lua
+%%INSTALLPATH%%/mod_password_reset.lua
 %%INSTALLPATH%%/mod_pastebin.lua
 %%INSTALLPATH%%/mod_pep_vcard_avatar.lua
 %%INSTALLPATH%%/mod_pep_vcard_png_avatar.lua
@@ -170,6 +217,7 @@
 %%INSTALLPATH%%/mod_privilege.lua
 %%INSTALLPATH%%/mod_proctitle.lua
 %%INSTALLPATH%%/mod_profile.lua
+%%INSTALLPATH%%/mod_prometheus.lua
 %%INSTALLPATH%%/mod_proxy65_whitelist.lua
 %%INSTALLPATH%%/mod_pubsub_eventsource.lua
 %%INSTALLPATH%%/mod_pubsub_feeds.lua
@@ -178,11 +226,15 @@
 %%INSTALLPATH%%/mod_pubsub_mqtt.lua
 %%INSTALLPATH%%/mod_pubsub_pivotaltracker.lua
 %%INSTALLPATH%%/mod_pubsub_post.lua
+%%INSTALLPATH%%/mod_pubsub_stats.lua
+%%INSTALLPATH%%/mod_pubsub_text_interface.lua
 %%INSTALLPATH%%/mod_pubsub_twitter.lua
 %%INSTALLPATH%%/mod_query_client_ver.lua
 %%INSTALLPATH%%/mod_rawdebug.lua
 %%INSTALLPATH%%/mod_readonly.lua
 %%INSTALLPATH%%/mod_register_dnsbl.lua
+%%INSTALLPATH%%/mod_register_dnsbl_firewall_mark.lua
+%%INSTALLPATH%%/mod_register_dnsbl_warn.lua
 %%INSTALLPATH%%/mod_register_oob_url.lua
 %%INSTALLPATH%%/mod_register_redirect.lua
 %%INSTALLPATH%%/mod_register_web.lua
@@ -196,6 +248,7 @@
 %%INSTALLPATH%%/mod_s2s_auth_dane.lua
 %%INSTALLPATH%%/mod_s2s_auth_fingerprint.lua
 %%INSTALLPATH%%/mod_s2s_auth_monkeysphere.lua
+%%INSTALLPATH%%/mod_s2s_auth_posh.lua
 %%INSTALLPATH%%/mod_s2s_auth_samecert.lua
 %%INSTALLPATH%%/mod_s2s_blacklist.lua
 %%INSTALLPATH%%/mod_s2s_idle_timeout.lua
@@ -206,18 +259,21 @@
 %%INSTALLPATH%%/mod_s2s_reload_newcomponent.lua
 %%INSTALLPATH%%/mod_s2s_whitelist.lua
 %%INSTALLPATH%%/mod_s2soutinjection.lua
+%%INSTALLPATH%%/mod_sasl_oauthbearer.lua
+%%INSTALLPATH%%/mod_sasl_token.lua
 %%INSTALLPATH%%/mod_saslauth_muc.lua
 %%INSTALLPATH%%/mod_saslname.lua
 %%INSTALLPATH%%/mod_seclabels.lua
 %%INSTALLPATH%%/mod_secure_interfaces.lua
-%%INSTALLPATH%%/mod_server_contact_info.lua
 %%INSTALLPATH%%/mod_server_status.lua
 %%INSTALLPATH%%/mod_service_directories.lua
 %%INSTALLPATH%%/mod_sift.lua
+%%INSTALLPATH%%/mod_slack_webhooks.lua
 %%INSTALLPATH%%/mod_smacks.lua
 %%INSTALLPATH%%/mod_smacks_noerror.lua
 %%INSTALLPATH%%/mod_smacks_offline.lua
 %%INSTALLPATH%%/mod_sms_clickatell.lua
+%%INSTALLPATH%%/mod_sms_free.lua
 %%INSTALLPATH%%/mod_spam_reporting.lua
 %%INSTALLPATH%%/mod_srvinjection.lua
 %%INSTALLPATH%%/mod_sslv3_warn.lua
@@ -229,6 +285,7 @@
 %%INSTALLPATH%%/mod_statistics_cputotal.lua
 %%INSTALLPATH%%/mod_statistics_mem.lua
 %%INSTALLPATH%%/mod_statistics_statsd.lua
+%%INSTALLPATH%%/mod_statistics_statsman.lua
 %%INSTALLPATH%%/mod_statsd.lua
 %%INSTALLPATH%%/mod_storage_appendmap.lua
 %%INSTALLPATH%%/mod_storage_ejabberdsql_readonly.lua
@@ -244,9 +301,11 @@
 %%INSTALLPATH%%/mod_streamstats.lua
 %%INSTALLPATH%%/mod_strict_https.lua
 %%INSTALLPATH%%/mod_support_contact.lua
+%%INSTALLPATH%%/mod_support_room.lua
 %%INSTALLPATH%%/mod_swedishchef.lua
 %%INSTALLPATH%%/mod_tcpproxy.lua
 %%INSTALLPATH%%/mod_telnet_tlsinfo.lua
+%%INSTALLPATH%%/mod_test_data.lua
 %%INSTALLPATH%%/mod_throttle_presence.lua
 %%INSTALLPATH%%/mod_throttle_unsolicited.lua
 %%INSTALLPATH%%/mod_tls_policy.lua
@@ -255,15 +314,20 @@
 %%INSTALLPATH%%/mod_turncredentials.lua
 %%INSTALLPATH%%/mod_twitter.lua
 %%INSTALLPATH%%/mod_uptime_presence.lua
+%%INSTALLPATH%%/mod_vcard_command.lua
+%%INSTALLPATH%%/mod_vcard_muc.lua
 %%INSTALLPATH%%/mod_vjud.lua
 %%INSTALLPATH%%/mod_watchuntrusted.lua
+%%INSTALLPATH%%/mod_web_push.lua
 %%INSTALLPATH%%/mod_webpresence.lua
 %%INSTALLPATH%%/mod_xhtmlim.lua
 %%INSTALLPATH%%/mqtt.lib.lua
-%%INSTALLPATH%%/prosodytop.lua
+%%INSTALLPATH%%/prosodytop.lib.lua
 %%INSTALLPATH%%/rsm.lib.lua
 %%INSTALLPATH%%/stats.lib.lua
 %%INSTALLPATH%%/test.lib.lua
-%%INSTALLPATH%%/top.lua
+%%INSTALLPATH%%/test_token_auth.lua
+%%INSTALLPATH%%/token_auth_utils.lib.lua
+%%INSTALLPATH%%/top.lib.lua
 %%INSTALLPATH%%/vcard.lib.lua
 %%PORTDOCS%%%%DOCSDIR%%/README