diff --git a/chat/matrix-synapse/Makefile b/chat/matrix-synapse/Makefile
index 8161ffaf8f60..984e088cb34c 100644
--- a/chat/matrix-synapse/Makefile
+++ b/chat/matrix-synapse/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2020/09/26 00:23:29 js Exp $
+# $NetBSD: Makefile,v 1.9 2020/10/17 11:42:35 js Exp $
 
-DISTNAME=	matrix-synapse-1.20.1
+DISTNAME=	matrix-synapse-1.21.2
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_GITHUB:=matrix-org/}
 EGG_NAME=	matrix_synapse-${PKGVERSION_NOREV}
diff --git a/chat/matrix-synapse/PLIST b/chat/matrix-synapse/PLIST
index 61c896f420c5..137c59d549ff 100644
--- a/chat/matrix-synapse/PLIST
+++ b/chat/matrix-synapse/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2020/09/22 21:21:51 js Exp $
+@comment $NetBSD: PLIST,v 1.3 2020/10/17 11:42:35 js Exp $
 bin/export_signing_key
 bin/generate_config
 bin/generate_log_config
@@ -717,6 +717,7 @@ ${PYSITELIB}/synapse/res/templates/add_threepid.html
 ${PYSITELIB}/synapse/res/templates/add_threepid.txt
 ${PYSITELIB}/synapse/res/templates/add_threepid_failure.html
 ${PYSITELIB}/synapse/res/templates/add_threepid_success.html
+${PYSITELIB}/synapse/res/templates/auth_success.html
 ${PYSITELIB}/synapse/res/templates/invalid_token.html
 ${PYSITELIB}/synapse/res/templates/mail-Element.css
 ${PYSITELIB}/synapse/res/templates/mail-Vector.css
@@ -730,20 +731,22 @@ ${PYSITELIB}/synapse/res/templates/notif_mail.html
 ${PYSITELIB}/synapse/res/templates/notif_mail.txt
 ${PYSITELIB}/synapse/res/templates/password_reset.html
 ${PYSITELIB}/synapse/res/templates/password_reset.txt
+${PYSITELIB}/synapse/res/templates/password_reset_confirmation.html
 ${PYSITELIB}/synapse/res/templates/password_reset_failure.html
 ${PYSITELIB}/synapse/res/templates/password_reset_success.html
+${PYSITELIB}/synapse/res/templates/recaptcha.html
 ${PYSITELIB}/synapse/res/templates/registration.html
 ${PYSITELIB}/synapse/res/templates/registration.txt
 ${PYSITELIB}/synapse/res/templates/registration_failure.html
 ${PYSITELIB}/synapse/res/templates/registration_success.html
 ${PYSITELIB}/synapse/res/templates/room.html
 ${PYSITELIB}/synapse/res/templates/room.txt
-${PYSITELIB}/synapse/res/templates/saml_error.html
 ${PYSITELIB}/synapse/res/templates/sso_account_deactivated.html
 ${PYSITELIB}/synapse/res/templates/sso_auth_confirm.html
 ${PYSITELIB}/synapse/res/templates/sso_auth_success.html
 ${PYSITELIB}/synapse/res/templates/sso_error.html
 ${PYSITELIB}/synapse/res/templates/sso_redirect_confirm.html
+${PYSITELIB}/synapse/res/templates/terms.html
 ${PYSITELIB}/synapse/rest/__init__.py
 ${PYSITELIB}/synapse/rest/__init__.pyc
 ${PYSITELIB}/synapse/rest/__init__.pyo
@@ -756,6 +759,9 @@ ${PYSITELIB}/synapse/rest/admin/_base.pyo
 ${PYSITELIB}/synapse/rest/admin/devices.py
 ${PYSITELIB}/synapse/rest/admin/devices.pyc
 ${PYSITELIB}/synapse/rest/admin/devices.pyo
+${PYSITELIB}/synapse/rest/admin/event_reports.py
+${PYSITELIB}/synapse/rest/admin/event_reports.pyc
+${PYSITELIB}/synapse/rest/admin/event_reports.pyo
 ${PYSITELIB}/synapse/rest/admin/groups.py
 ${PYSITELIB}/synapse/rest/admin/groups.pyc
 ${PYSITELIB}/synapse/rest/admin/groups.pyo
@@ -978,6 +984,15 @@ ${PYSITELIB}/synapse/rest/saml2/metadata_resource.pyo
 ${PYSITELIB}/synapse/rest/saml2/response_resource.py
 ${PYSITELIB}/synapse/rest/saml2/response_resource.pyc
 ${PYSITELIB}/synapse/rest/saml2/response_resource.pyo
+${PYSITELIB}/synapse/rest/synapse/__init__.py
+${PYSITELIB}/synapse/rest/synapse/__init__.pyc
+${PYSITELIB}/synapse/rest/synapse/__init__.pyo
+${PYSITELIB}/synapse/rest/synapse/client/__init__.py
+${PYSITELIB}/synapse/rest/synapse/client/__init__.pyc
+${PYSITELIB}/synapse/rest/synapse/client/__init__.pyo
+${PYSITELIB}/synapse/rest/synapse/client/password_reset.py
+${PYSITELIB}/synapse/rest/synapse/client/password_reset.pyc
+${PYSITELIB}/synapse/rest/synapse/client/password_reset.pyo
 ${PYSITELIB}/synapse/rest/well_known.py
 ${PYSITELIB}/synapse/rest/well_known.pyc
 ${PYSITELIB}/synapse/rest/well_known.pyo
@@ -1370,10 +1385,13 @@ ${PYSITELIB}/synapse/storage/databases/main/schema/delta/58/05cache_instance.sql
 ${PYSITELIB}/synapse/storage/databases/main/schema/delta/58/06dlols_unique_idx.py
 ${PYSITELIB}/synapse/storage/databases/main/schema/delta/58/06dlols_unique_idx.pyc
 ${PYSITELIB}/synapse/storage/databases/main/schema/delta/58/06dlols_unique_idx.pyo
+${PYSITELIB}/synapse/storage/databases/main/schema/delta/58/07add_method_to_thumbnail_constraint.sql.postgres
+${PYSITELIB}/synapse/storage/databases/main/schema/delta/58/07add_method_to_thumbnail_constraint.sql.sqlite
 ${PYSITELIB}/synapse/storage/databases/main/schema/delta/58/07persist_ui_auth_ips.sql
 ${PYSITELIB}/synapse/storage/databases/main/schema/delta/58/08_media_safe_from_quarantine.sql.postgres
 ${PYSITELIB}/synapse/storage/databases/main/schema/delta/58/08_media_safe_from_quarantine.sql.sqlite
 ${PYSITELIB}/synapse/storage/databases/main/schema/delta/58/09shadow_ban.sql
+${PYSITELIB}/synapse/storage/databases/main/schema/delta/58/10_pushrules_enabled_delete_obsolete.sql
 ${PYSITELIB}/synapse/storage/databases/main/schema/delta/58/10drop_local_rejections_stream.sql
 ${PYSITELIB}/synapse/storage/databases/main/schema/delta/58/10federation_pos_instance_name.sql
 ${PYSITELIB}/synapse/storage/databases/main/schema/delta/58/11user_id_seq.py
@@ -1381,7 +1399,13 @@ ${PYSITELIB}/synapse/storage/databases/main/schema/delta/58/11user_id_seq.pyc
 ${PYSITELIB}/synapse/storage/databases/main/schema/delta/58/11user_id_seq.pyo
 ${PYSITELIB}/synapse/storage/databases/main/schema/delta/58/12room_stats.sql
 ${PYSITELIB}/synapse/storage/databases/main/schema/delta/58/13remove_presence_allow_inbound.sql
+${PYSITELIB}/synapse/storage/databases/main/schema/delta/58/14events_instance_name.sql
+${PYSITELIB}/synapse/storage/databases/main/schema/delta/58/14events_instance_name.sql.postgres
+${PYSITELIB}/synapse/storage/databases/main/schema/delta/58/15_catchup_destination_rooms.sql
 ${PYSITELIB}/synapse/storage/databases/main/schema/delta/58/15unread_count.sql
+${PYSITELIB}/synapse/storage/databases/main/schema/delta/58/16populate_stats_process_rooms_fix.sql
+${PYSITELIB}/synapse/storage/databases/main/schema/delta/58/17_catchup_last_successful.sql
+${PYSITELIB}/synapse/storage/databases/main/schema/delta/58/18stream_positions.sql
 ${PYSITELIB}/synapse/storage/databases/main/schema/full_schemas/16/application_services.sql
 ${PYSITELIB}/synapse/storage/databases/main/schema/full_schemas/16/event_edges.sql
 ${PYSITELIB}/synapse/storage/databases/main/schema/full_schemas/16/event_signatures.sql
diff --git a/chat/matrix-synapse/distinfo b/chat/matrix-synapse/distinfo
index 6cf0e8a723a9..9ce666c0b742 100644
--- a/chat/matrix-synapse/distinfo
+++ b/chat/matrix-synapse/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2020/09/26 00:23:29 js Exp $
+$NetBSD: distinfo,v 1.6 2020/10/17 11:42:35 js Exp $
 
-SHA1 (matrix-synapse-1.20.1.tar.gz) = f3a7447a570fe7c5566a1f17de4d4e513a252dfc
-RMD160 (matrix-synapse-1.20.1.tar.gz) = e7c197edbd15a2440aac22eebca4de38a10c2cf1
-SHA512 (matrix-synapse-1.20.1.tar.gz) = 44ebad9c2f8f6bf90f15a0377552c233b4201a47106fb9d2fd3f6deab89ed7a638ee47a805a788a7cf20a400533a27bee24e84e4bef158c14f234023c1897681
-Size (matrix-synapse-1.20.1.tar.gz) = 6891101 bytes
+SHA1 (matrix-synapse-1.21.2.tar.gz) = ff7321bec10acf5f59534535f077fdc88601e3f7
+RMD160 (matrix-synapse-1.21.2.tar.gz) = d1a479ab67c748e14f04f3834db2ff27b88ef5fb
+SHA512 (matrix-synapse-1.21.2.tar.gz) = 745ea382e38fa427e062fdab595c45b350bdd8002af252f38dff3e5b0bbee50230ff10bdf9e39fc97071c96340f89a7a994ab2238aaa16da65b145c1e144edaa
+Size (matrix-synapse-1.21.2.tar.gz) = 6930190 bytes