diff --git a/chat/matrix-synapse/Makefile b/chat/matrix-synapse/Makefile
index 229297580740..550ee1dc7f11 100644
--- a/chat/matrix-synapse/Makefile
+++ b/chat/matrix-synapse/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.33 2021/08/31 19:57:59 js Exp $
+# $NetBSD: Makefile,v 1.33.2.1 2021/11/24 19:52:42 spz Exp $
 
-DISTNAME=	matrix-synapse-1.41.1
+DISTNAME=	matrix-synapse-1.47.1
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_GITHUB:=matrix-org/}
 EGG_NAME=	matrix_synapse-${PKGVERSION_NOREV}
@@ -13,7 +13,7 @@ COMMENT=	Reference homeserver for the Matrix decentralised comms protocol
 LICENSE=	apache-2.0
 
 DEPENDS+=	${PYPKGPREFIX}-sqlite3>=0:../../databases/py-sqlite3
-DEPENDS+=	${PYPKGPREFIX}-jsonschema>=2.5.1:../../textproc/py-jsonschema
+DEPENDS+=	${PYPKGPREFIX}-jsonschema>=3.0.0:../../textproc/py-jsonschema
 DEPENDS+=	${PYPKGPREFIX}-frozendict>=1:../../devel/py-frozendict
 DEPENDS+=	${PYPKGPREFIX}-unpaddedbase64>=1.1.0:../../devel/py-unpaddedbase64
 DEPENDS+=	${PYPKGPREFIX}-canonicaljson>=1.4.0:../../devel/py-canonicaljson
@@ -27,14 +27,12 @@ DEPENDS+=	${PYPKGPREFIX}-OpenSSL>=16.0.0:../../security/py-OpenSSL
 DEPENDS+=	${PYPKGPREFIX}-yaml>=3.11:../../textproc/py-yaml
 DEPENDS+=	${PYPKGPREFIX}-asn1>=0.1.9:../../security/py-asn1
 DEPENDS+=	${PYPKGPREFIX}-asn1-modules>=0.0.7:../../security/py-asn1-modules
-DEPENDS+=	${PYPKGPREFIX}-daemonize>=2.3.1:../../devel/py-daemonize
 DEPENDS+=	${PYPKGPREFIX}-bcrypt>=3.1.0:../../security/py-bcrypt
 DEPENDS+=	${PYPKGPREFIX}-sortedcontainers>=1.4.4:../../devel/py-sortedcontainers
 DEPENDS+=	${PYPKGPREFIX}-macaroons>=0.13.0:../../devel/py-macaroons
 DEPENDS+=	${PYPKGPREFIX}-msgpack>=0.5.2:../../devel/py-msgpack
 DEPENDS+=	${PYPKGPREFIX}-phonenumbers>=8.2.0:../../textproc/py-phonenumbers
-DEPENDS+=	${PYPKGPREFIX}-six>=1.10:../../lang/py-six
-DEPENDS+=	${PYPKGPREFIX}-prometheus_client>=0.8.0:../../net/py-prometheus_client
+DEPENDS+=	${PYPKGPREFIX}-prometheus_client>=0.4.0:../../net/py-prometheus_client
 DEPENDS+=	${PYPKGPREFIX}-attrs>=19.2.0:../../devel/py-attrs
 DEPENDS+=	${PYPKGPREFIX}-netaddr>=0.7.18:../../net/py-netaddr
 DEPENDS+=	${PYPKGPREFIX}-jinja2>=2.9:../../textproc/py-jinja2
diff --git a/chat/matrix-synapse/PLIST b/chat/matrix-synapse/PLIST
index 9f46bad6cb51..d370e4261a3c 100644
--- a/chat/matrix-synapse/PLIST
+++ b/chat/matrix-synapse/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2021/08/31 19:57:59 js Exp $
+@comment $NetBSD: PLIST,v 1.17.2.1 2021/11/24 19:52:42 spz Exp $
 bin/export_signing_key
 bin/generate_config
 bin/generate_log_config
@@ -10,6 +10,7 @@ bin/synapse_port_db
 bin/synapse_review_recent_signups
 bin/sync_room_to_group.pl
 bin/synctl
+bin/update_synapse_database
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -185,6 +186,9 @@ ${PYSITELIB}/synapse/config/metrics.pyo
 ${PYSITELIB}/synapse/config/modules.py
 ${PYSITELIB}/synapse/config/modules.pyc
 ${PYSITELIB}/synapse/config/modules.pyo
+${PYSITELIB}/synapse/config/oembed.py
+${PYSITELIB}/synapse/config/oembed.pyc
+${PYSITELIB}/synapse/config/oembed.pyo
 ${PYSITELIB}/synapse/config/oidc.py
 ${PYSITELIB}/synapse/config/oidc.pyc
 ${PYSITELIB}/synapse/config/oidc.pyo
@@ -206,6 +210,9 @@ ${PYSITELIB}/synapse/config/registration.pyo
 ${PYSITELIB}/synapse/config/repository.py
 ${PYSITELIB}/synapse/config/repository.pyc
 ${PYSITELIB}/synapse/config/repository.pyo
+${PYSITELIB}/synapse/config/retention.py
+${PYSITELIB}/synapse/config/retention.pyc
+${PYSITELIB}/synapse/config/retention.pyo
 ${PYSITELIB}/synapse/config/room.py
 ${PYSITELIB}/synapse/config/room.pyc
 ${PYSITELIB}/synapse/config/room.pyo
@@ -350,9 +357,6 @@ ${PYSITELIB}/synapse/groups/groups_server.pyo
 ${PYSITELIB}/synapse/handlers/__init__.py
 ${PYSITELIB}/synapse/handlers/__init__.pyc
 ${PYSITELIB}/synapse/handlers/__init__.pyo
-${PYSITELIB}/synapse/handlers/_base.py
-${PYSITELIB}/synapse/handlers/_base.pyc
-${PYSITELIB}/synapse/handlers/_base.pyo
 ${PYSITELIB}/synapse/handlers/account_data.py
 ${PYSITELIB}/synapse/handlers/account_data.pyc
 ${PYSITELIB}/synapse/handlers/account_data.pyo
@@ -398,6 +402,9 @@ ${PYSITELIB}/synapse/handlers/events.pyo
 ${PYSITELIB}/synapse/handlers/federation.py
 ${PYSITELIB}/synapse/handlers/federation.pyc
 ${PYSITELIB}/synapse/handlers/federation.pyo
+${PYSITELIB}/synapse/handlers/federation_event.py
+${PYSITELIB}/synapse/handlers/federation_event.pyc
+${PYSITELIB}/synapse/handlers/federation_event.pyo
 ${PYSITELIB}/synapse/handlers/groups_local.py
 ${PYSITELIB}/synapse/handlers/groups_local.pyc
 ${PYSITELIB}/synapse/handlers/groups_local.pyo
@@ -437,6 +444,9 @@ ${PYSITELIB}/synapse/handlers/register.pyo
 ${PYSITELIB}/synapse/handlers/room.py
 ${PYSITELIB}/synapse/handlers/room.pyc
 ${PYSITELIB}/synapse/handlers/room.pyo
+${PYSITELIB}/synapse/handlers/room_batch.py
+${PYSITELIB}/synapse/handlers/room_batch.pyc
+${PYSITELIB}/synapse/handlers/room_batch.pyo
 ${PYSITELIB}/synapse/handlers/room_list.py
 ${PYSITELIB}/synapse/handlers/room_list.pyc
 ${PYSITELIB}/synapse/handlers/room_list.pyo
@@ -623,6 +633,7 @@ ${PYSITELIB}/synapse/push/pusherpool.pyo
 ${PYSITELIB}/synapse/push/rulekinds.py
 ${PYSITELIB}/synapse/push/rulekinds.pyc
 ${PYSITELIB}/synapse/push/rulekinds.pyo
+${PYSITELIB}/synapse/py.typed
 ${PYSITELIB}/synapse/python_dependencies.py
 ${PYSITELIB}/synapse/python_dependencies.pyc
 ${PYSITELIB}/synapse/python_dependencies.pyo
@@ -758,6 +769,7 @@ ${PYSITELIB}/synapse/replication/tcp/streams/events.pyo
 ${PYSITELIB}/synapse/replication/tcp/streams/federation.py
 ${PYSITELIB}/synapse/replication/tcp/streams/federation.pyc
 ${PYSITELIB}/synapse/replication/tcp/streams/federation.pyo
+${PYSITELIB}/synapse/res/providers.json
 ${PYSITELIB}/synapse/res/templates/account_previously_renewed.html
 ${PYSITELIB}/synapse/res/templates/account_renewed.html
 ${PYSITELIB}/synapse/res/templates/add_threepid.html
@@ -786,6 +798,7 @@ ${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/registration_token.html
 ${PYSITELIB}/synapse/res/templates/room.html
 ${PYSITELIB}/synapse/res/templates/room.txt
 ${PYSITELIB}/synapse/res/templates/sso.css
@@ -811,6 +824,9 @@ ${PYSITELIB}/synapse/rest/admin/__init__.pyo
 ${PYSITELIB}/synapse/rest/admin/_base.py
 ${PYSITELIB}/synapse/rest/admin/_base.pyc
 ${PYSITELIB}/synapse/rest/admin/_base.pyo
+${PYSITELIB}/synapse/rest/admin/background_updates.py
+${PYSITELIB}/synapse/rest/admin/background_updates.pyc
+${PYSITELIB}/synapse/rest/admin/background_updates.pyo
 ${PYSITELIB}/synapse/rest/admin/devices.py
 ${PYSITELIB}/synapse/rest/admin/devices.pyc
 ${PYSITELIB}/synapse/rest/admin/devices.pyo
@@ -823,9 +839,9 @@ ${PYSITELIB}/synapse/rest/admin/groups.pyo
 ${PYSITELIB}/synapse/rest/admin/media.py
 ${PYSITELIB}/synapse/rest/admin/media.pyc
 ${PYSITELIB}/synapse/rest/admin/media.pyo
-${PYSITELIB}/synapse/rest/admin/purge_room_servlet.py
-${PYSITELIB}/synapse/rest/admin/purge_room_servlet.pyc
-${PYSITELIB}/synapse/rest/admin/purge_room_servlet.pyo
+${PYSITELIB}/synapse/rest/admin/registration_tokens.py
+${PYSITELIB}/synapse/rest/admin/registration_tokens.pyc
+${PYSITELIB}/synapse/rest/admin/registration_tokens.pyo
 ${PYSITELIB}/synapse/rest/admin/rooms.py
 ${PYSITELIB}/synapse/rest/admin/rooms.pyc
 ${PYSITELIB}/synapse/rest/admin/rooms.pyo
@@ -1015,6 +1031,9 @@ ${PYSITELIB}/synapse/rest/media/v1/media_repository.pyo
 ${PYSITELIB}/synapse/rest/media/v1/media_storage.py
 ${PYSITELIB}/synapse/rest/media/v1/media_storage.pyc
 ${PYSITELIB}/synapse/rest/media/v1/media_storage.pyo
+${PYSITELIB}/synapse/rest/media/v1/oembed.py
+${PYSITELIB}/synapse/rest/media/v1/oembed.pyc
+${PYSITELIB}/synapse/rest/media/v1/oembed.pyo
 ${PYSITELIB}/synapse/rest/media/v1/preview_url_resource.py
 ${PYSITELIB}/synapse/rest/media/v1/preview_url_resource.pyc
 ${PYSITELIB}/synapse/rest/media/v1/preview_url_resource.pyo
@@ -1233,12 +1252,18 @@ ${PYSITELIB}/synapse/storage/databases/main/relations.pyo
 ${PYSITELIB}/synapse/storage/databases/main/room.py
 ${PYSITELIB}/synapse/storage/databases/main/room.pyc
 ${PYSITELIB}/synapse/storage/databases/main/room.pyo
+${PYSITELIB}/synapse/storage/databases/main/room_batch.py
+${PYSITELIB}/synapse/storage/databases/main/room_batch.pyc
+${PYSITELIB}/synapse/storage/databases/main/room_batch.pyo
 ${PYSITELIB}/synapse/storage/databases/main/roommember.py
 ${PYSITELIB}/synapse/storage/databases/main/roommember.pyc
 ${PYSITELIB}/synapse/storage/databases/main/roommember.pyo
 ${PYSITELIB}/synapse/storage/databases/main/search.py
 ${PYSITELIB}/synapse/storage/databases/main/search.pyc
 ${PYSITELIB}/synapse/storage/databases/main/search.pyo
+${PYSITELIB}/synapse/storage/databases/main/session.py
+${PYSITELIB}/synapse/storage/databases/main/session.pyc
+${PYSITELIB}/synapse/storage/databases/main/session.pyo
 ${PYSITELIB}/synapse/storage/databases/main/signatures.py
 ${PYSITELIB}/synapse/storage/databases/main/signatures.pyc
 ${PYSITELIB}/synapse/storage/databases/main/signatures.pyo
@@ -1618,6 +1643,18 @@ ${PYSITELIB}/synapse/storage/schema/main/delta/61/03recreate_min_depth.py
 ${PYSITELIB}/synapse/storage/schema/main/delta/61/03recreate_min_depth.pyc
 ${PYSITELIB}/synapse/storage/schema/main/delta/61/03recreate_min_depth.pyo
 ${PYSITELIB}/synapse/storage/schema/main/delta/62/01insertion_event_extremities.sql
+${PYSITELIB}/synapse/storage/schema/main/delta/63/01create_registration_tokens.sql
+${PYSITELIB}/synapse/storage/schema/main/delta/63/02delete_unlinked_email_pushers.sql
+${PYSITELIB}/synapse/storage/schema/main/delta/63/02populate-rooms-creator.sql
+${PYSITELIB}/synapse/storage/schema/main/delta/63/03session_store.sql
+${PYSITELIB}/synapse/storage/schema/main/delta/63/04add_presence_stream_not_offline_index.sql
+${PYSITELIB}/synapse/storage/schema/main/delta/64/01msc2716_chunk_to_batch_rename.sql.postgres
+${PYSITELIB}/synapse/storage/schema/main/delta/64/01msc2716_chunk_to_batch_rename.sql.sqlite
+${PYSITELIB}/synapse/storage/schema/main/delta/65/01msc2716_insertion_event_edges.sql
+${PYSITELIB}/synapse/storage/schema/main/delta/65/02_thread_relations.sql
+${PYSITELIB}/synapse/storage/schema/main/delta/65/03remove_hidden_devices_from_device_inbox.sql
+${PYSITELIB}/synapse/storage/schema/main/delta/65/04_local_group_updates.sql
+${PYSITELIB}/synapse/storage/schema/main/delta/65/06remove_deleted_devices_from_device_inbox.sql
 ${PYSITELIB}/synapse/storage/schema/main/full_schemas/16/application_services.sql
 ${PYSITELIB}/synapse/storage/schema/main/full_schemas/16/event_edges.sql
 ${PYSITELIB}/synapse/storage/schema/main/full_schemas/16/event_signatures.sql
@@ -1729,6 +1766,9 @@ ${PYSITELIB}/synapse/util/file_consumer.pyo
 ${PYSITELIB}/synapse/util/frozenutils.py
 ${PYSITELIB}/synapse/util/frozenutils.pyc
 ${PYSITELIB}/synapse/util/frozenutils.pyo
+${PYSITELIB}/synapse/util/gai_resolver.py
+${PYSITELIB}/synapse/util/gai_resolver.pyc
+${PYSITELIB}/synapse/util/gai_resolver.pyo
 ${PYSITELIB}/synapse/util/hash.py
 ${PYSITELIB}/synapse/util/hash.pyc
 ${PYSITELIB}/synapse/util/hash.pyo
diff --git a/chat/matrix-synapse/distinfo b/chat/matrix-synapse/distinfo
index ec9997f78f37..f116548e3e30 100644
--- a/chat/matrix-synapse/distinfo
+++ b/chat/matrix-synapse/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.23 2021/08/31 19:57:59 js Exp $
+$NetBSD: distinfo,v 1.23.2.1 2021/11/24 19:52:42 spz Exp $
 
-SHA1 (matrix-synapse-1.41.1.tar.gz) = f9a2387a209824077cb45f3fe14775bb3d356be5
-RMD160 (matrix-synapse-1.41.1.tar.gz) = f2392d2fc7a84c4524edc74a3aee268e974dc291
-SHA512 (matrix-synapse-1.41.1.tar.gz) = 04af3261433874141372ddb91150f4e801770c73d42305c94db13a0e420ee7c483b50c4b7c4aca59ec98762b65823d2cdabb75409eb66b2ced47a5c316206767
-Size (matrix-synapse-1.41.1.tar.gz) = 7436053 bytes
+SHA1 (matrix-synapse-1.47.1.tar.gz) = 7d683830d7cae54228345361ee4009ef03c3f1fb
+RMD160 (matrix-synapse-1.47.1.tar.gz) = 568f0fd723c6a45d0ba6cdb5a84670ce6c4e1a19
+SHA512 (matrix-synapse-1.47.1.tar.gz) = 29ebfcf43e7766a638cd26e17430772625651cd8d28c8637ae5d2550207a0131f7eeab0cbe2d8e9e4914ffa13cbafe830ef0e80b22a356ac5abe6a88733ad97c
+Size (matrix-synapse-1.47.1.tar.gz) = 7566339 bytes
 SHA1 (patch-synapse_handlers_room.py) = f9a62add7171898ec0ea76360f0a4c9969609537
 SHA1 (patch-synapse_python_dependencies.py) = 914ae3a34a9367b2d479d393ddc7a07cbff65b36