diff --git a/_service b/_service
index 660c8c7..4c3e563 100644
--- a/_service
+++ b/_service
@@ -4,7 +4,7 @@
     <param name="versionformat">@PARENT_TAG@</param>
     <param name="url">https://github.com/matrix-org/synapse.git</param>
     <param name="scm">git</param>
-    <param name="revision">v1.17.0</param>
+    <param name="revision">v1.18.0</param>
     <param name="versionrewrite-pattern">v(.*)</param>
     <param name="versionrewrite-replacement">\1</param>
     <!--
diff --git a/matrix-synapse-1.17.0.obscpio b/matrix-synapse-1.17.0.obscpio
deleted file mode 100644
index bb7ce8c..0000000
--- a/matrix-synapse-1.17.0.obscpio
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:74dcda718195da0fcf3399b5bb9bd2eba77e309629ef58ecbfd97414e018ce56
-size 27525133
diff --git a/matrix-synapse-1.18.0.obscpio b/matrix-synapse-1.18.0.obscpio
new file mode 100644
index 0000000..89e1082
--- /dev/null
+++ b/matrix-synapse-1.18.0.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c0381b5786225968cf36f92d3fb0e6cc27560be644d2eef22b33f18a81c1ac4e
+size 27662861
diff --git a/matrix-synapse-test.spec b/matrix-synapse-test.spec
index 834b1f3..282bcc9 100644
--- a/matrix-synapse-test.spec
+++ b/matrix-synapse-test.spec
@@ -32,7 +32,7 @@
 
 %define         pkgname matrix-synapse
 Name:           %{pkgname}-test
-Version:        1.17.0
+Version:        1.18.0
 Release:        0
 Summary:        Test package for %{pkgname}
 License:        Apache-2.0
diff --git a/matrix-synapse.changes b/matrix-synapse.changes
index 471fbb5..dece520 100644
--- a/matrix-synapse.changes
+++ b/matrix-synapse.changes
@@ -1,12 +1,65 @@
+-------------------------------------------------------------------
+Thu Jul 30 11:40:22 UTC 2020 - Aleksa Sarai <asarai@suse.com>
+
+- Update to synapse 1.18.0.
+  * Features
+    + Include room states on invite events that are sent to application
+      services.
+    + Add delete room admin endpoint (POST /_synapse/admin/v1/rooms/<room_id>/delete).
+    + Add experimental support for running multiple federation sender
+      processes.
+    + Add the option to validate the iss and aud claims for JWT logins.
+    + Add support for handling registration requests across multiple client
+      reader workers.
+    + Add an admin API to list the users in a room. Contributed by Awesome
+      Technologies Innovationslabor GmbH.
+    + Allow email subjects to be customised through Synapse's configuration.
+    + Add the ability to re-activate an account from the admin API.
+    + Add experimental support for running multiple pusher workers.
+    + Add experimental support for moving typing off master.
+    + Report CPU metrics to prometheus for time spent processing replication
+      commands.
+    + Support oEmbed for media previews.
+    + Abort federation requests where the client disconnects before the
+      ratelimiter expires.
+    + Cache responses to /_matrix/federation/v1/state_ids to reduce duplicated
+      work.
+  * Bugfixes
+    * Fix detection of out of sync remote device lists when receiving events
+      from remote users.
+    * Fix bug where Synapse fails to process an incoming event over federation
+      if the server is missing too much of the event's auth chain.
+    * Fix a bug causing Synapse to misinterpret the value off for
+      encryption_enabled_by_default_for_room_type in its configuration file(s)
+      if that value isn't surrounded by quotes. This bug was introduced in
+      v1.16.0.
+    * Fix bug where we did not always pass in app_name or server_name to email
+      templates, including e.g. for registration emails.
+    * Errors which occur while using the non-standard JWT login now return the
+      proper error: 403 Forbidden with an error code of M_FORBIDDEN.
+    * Fix "AttributeError: 'str' object has no attribute 'get'" error message
+      when applying per-room message retention policies. The bug was introduced
+      in Synapse 1.7.0.
+    * Fix a bug introduced in Synapse 1.10.0 which could cause a "no create
+      event in auth events" error during room creation.
+    * Fix a bug which allowed empty rooms to be rejoined over federation.
+    * Fix 'Unable to find a suitable guest user ID' error when using multiple
+      client_reader workers.
+    * Fix a long standing bug where the tracing of async functions with
+      opentracing was broken.
+    * Fix "TypeError in synapse.notifier" exceptions.
+    * Fix deprecation warning due to invalid escape sequences.
+
+
 -------------------------------------------------------------------
 Mon Jul 13 11:55:06 UTC 2020 - Marcus Rueckert <mrueckert@suse.de>
 
-- allow newer prometheus client (follow up to change in the code) 
+- allow newer prometheus client (follow up to change in the code)
 
 -------------------------------------------------------------------
 Mon Jul 13 11:19:25 UTC 2020 - Marcus Rueckert <mrueckert@suse.de>
 
-- Update to 1.17.0 
+- Update to 1.17.0
   - Bugfixes
     - Fix inconsistent handling of upper and lower case in email
       addresses when used as identifiers for login, etc.
@@ -60,7 +113,7 @@ Mon Jul 13 11:19:25 UTC 2020 - Marcus Rueckert <mrueckert@suse.de>
 -------------------------------------------------------------------
 Fri Jul 10 12:03:25 UTC 2020 - Marcus Rueckert <mrueckert@suse.de>
 
-- Update to 1.16.1 
+- Update to 1.16.1
   - Drop table local_rejections_stream which was incorrectly added
     in Synapse 1.16.0. (#7816, b1beb3ff5)
 
@@ -172,16 +225,16 @@ Thu Jul  2 15:34:54 UTC 2020 - Marcus Rueckert <mrueckert@suse.de>
 -------------------------------------------------------------------
 Tue Jun 16 18:36:01 UTC 2020 - Marcus Rueckert <mrueckert@suse.de>
 
-- Update to 1.15.1 
+- Update to 1.15.1
   - Fix a bug introduced in v1.15.0 that would crash Synapse on
     start when using certain password auth providers. (#7684)
   - Fix a bug introduced in v1.15.0 which meant that some 3PID
-    management endpoints were not accessible on the correct URL. 
+    management endpoints were not accessible on the correct URL.
 
 -------------------------------------------------------------------
 Thu Jun 11 14:28:57 UTC 2020 - Marcus Rueckert <mrueckert@suse.de>
 
-- Update to 1.15.0 
+- Update to 1.15.0
   - Features
     - Advertise support for Client-Server API r0.6.0 and remove
       related unstable feature flags. (#6585)
@@ -655,7 +708,7 @@ Mon Mar 23 14:36:36 UTC 2020 - Marcus Rueckert <mrueckert@suse.de>
 -------------------------------------------------------------------
 Tue Mar  3 21:43:02 UTC 2020 - Marcus Rueckert <mrueckert@suse.de>
 
-- Update to 1.11.1 
+- Update to 1.11.1
   This release includes a security fix impacting installations
   using Single Sign-On (i.e. SAML2 or CAS) for authentication.
   Administrators of such installations are encouraged to upgrade as
diff --git a/matrix-synapse.obsinfo b/matrix-synapse.obsinfo
index dd2c18d..d4458e4 100644
--- a/matrix-synapse.obsinfo
+++ b/matrix-synapse.obsinfo
@@ -1,5 +1,5 @@
 name: matrix-synapse
-version: 1.17.0
-mtime: 1594632036
-commit: 29df3d0e9f455c780d8489cc9bc293cb6fa6bc1e
+version: 1.18.0
+mtime: 1596106751
+commit: 320ef98852227210c630955dd4ad863a764a617c
 
diff --git a/matrix-synapse.spec b/matrix-synapse.spec
index 4854e74..728b216 100644
--- a/matrix-synapse.spec
+++ b/matrix-synapse.spec
@@ -46,7 +46,7 @@
 %define         modname synapse
 %define         pkgname matrix-synapse
 Name:           %{pkgname}
-Version:        1.17.0
+Version:        1.18.0
 Release:        0
 Summary:        Matrix protocol reference homeserver
 License:        Apache-2.0