diff --git a/debian/patches/0005-Honour-config.web_client.patch b/debian/patches/0005-Honour-config.web_client.patch
deleted file mode 100644
index cafa3b6..0000000
--- a/debian/patches/0005-Honour-config.web_client.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Erik Johnston <erikj@matrix.org>
-Date: Fri, 10 Jun 2016 13:24:51 +0100
-Subject: Honour config.web_client
-
----
- synapse/app/homeserver.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
-index 5a0329b..492b05f 100755
---- a/synapse/app/homeserver.py
-+++ b/synapse/app/homeserver.py
-@@ -146,7 +146,7 @@ class SynapseHomeServer(HomeServer):
-                         SERVER_KEY_V2_PREFIX: KeyApiV2Resource(self),
-                     })
- 
--                if name == "webclient":
-+                if name == "webclient" and config.web_client:
-                     resources[WEB_CLIENT_PREFIX] = build_resource_for_web_client(self)
- 
-                 if name == "metrics" and self.get_config().enable_metrics:
diff --git a/debian/patches/remove-webclient.patch b/debian/patches/remove-webclient.patch
new file mode 100644
index 0000000..8f07355
--- /dev/null
+++ b/debian/patches/remove-webclient.patch
@@ -0,0 +1,31 @@
+Index: package-synapse-debian/synapse/app/homeserver.py
+===================================================================
+--- package-synapse-debian.orig/synapse/app/homeserver.py
++++ package-synapse-debian/synapse/app/homeserver.py
+@@ -109,7 +109,7 @@ class SynapseHomeServer(HomeServer):
+         for res in listener_config["resources"]:
+             for name in res["names"]:
+                 resources.update(self._configure_named_resource(
+-                    name, res.get("compress", False),
++                    config, name, res.get("compress", False),
+                 ))
+ 
+         additional_resources = listener_config.get("additional_resources", {})
+@@ -155,7 +155,7 @@ class SynapseHomeServer(HomeServer):
+                 )
+         logger.info("Synapse now listening on port %d", port)
+ 
+-    def _configure_named_resource(self, name, compress=False):
++    def _configure_named_resource(self, config, name, compress=False):
+         """Build a resource map for a named resource
+ 
+         Args:
+@@ -208,7 +208,7 @@ class SynapseHomeServer(HomeServer):
+                 SERVER_KEY_V2_PREFIX: KeyApiV2Resource(self),
+             })
+ 
+-        if name == "webclient":
++        if name == "webclient" and config.web_client:
+             resources[WEB_CLIENT_PREFIX] = build_resource_for_web_client(self)
+ 
+         if name == "metrics" and self.get_config().enable_metrics:
diff --git a/debian/patches/series b/debian/patches/series
index ababe19..2036774 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,5 @@
 0002-change_instructions.patch
 0003-saml2.patch
 0004-webclient-instructions.patch
-0005-Honour-config.web_client.patch
 0006-Don-t-require-strict-nacl-0.3.0-requirement.patch
+remove-webclient.patch