diff --git a/docs/userguide/calling.rst b/docs/userguide/calling.rst
index 03a419c3c3e..59134d6d078 100644
--- a/docs/userguide/calling.rst
+++ b/docs/userguide/calling.rst
@@ -503,11 +503,11 @@ Celery can compress messages using the following builtin schemes:
     documents. It is most effective for serving static content
     such as fonts and html pages.
 
-    To use it, install kombu with:
+    To use it, install Celery with:
 
     .. code-block:: console
 
-      $ pip install kombu[brotli]
+      $ pip install celery[brotli]
 
 - `bzip2`
 
@@ -572,7 +572,7 @@ Celery can compress messages using the following builtin schemes:
 
     .. code-block:: console
 
-      $ pip install kombu[lzma]
+      $ pip install celery[lzma]
 
 - `zlib`
 
@@ -602,11 +602,11 @@ Celery can compress messages using the following builtin schemes:
     and better compression ratios. It's backed by a very fast entropy
     stage, provided by Huff0 and FSE library.
 
-    To use it, install kombu with:
+    To use it, install Celery with:
 
     .. code-block:: console
 
-      $ pip install kombu[zstd]
+      $ pip install celery[zstd]
 
 You can also create your own compression schemes and register
 them in the :func:`kombu compression registry <kombu.compression.register>`.
diff --git a/requirements/extras/brotli.txt b/requirements/extras/brotli.txt
new file mode 100644
index 00000000000..a449c7de85a
--- /dev/null
+++ b/requirements/extras/brotli.txt
@@ -0,0 +1,2 @@
+brotlipy>=0.7.0;python_implementation=="PyPy"
+brotli>=1.0.0;python_implementation=="CPython"
diff --git a/requirements/extras/lzma.txt b/requirements/extras/lzma.txt
new file mode 100644
index 00000000000..9c70afdf861
--- /dev/null
+++ b/requirements/extras/lzma.txt
@@ -0,0 +1 @@
+backports.lzma;python_version<"3.3"
diff --git a/requirements/extras/zstd.txt b/requirements/extras/zstd.txt
new file mode 100644
index 00000000000..864700d2b3e
--- /dev/null
+++ b/requirements/extras/zstd.txt
@@ -0,0 +1 @@
+zstandard
diff --git a/setup.py b/setup.py
index 7287852453f..714d09288a8 100644
--- a/setup.py
+++ b/setup.py
@@ -50,35 +50,38 @@ def _pyimp():
 # -*- Extras -*-
 
 EXTENSIONS = {
+    'arangodb',
     'auth',
+    'azureblockblob',
+    'brotli',
     'cassandra',
+    'consul',
+    'cosmosdbsql',
+    'couchbase',
+    'couchdb',
     'django',
+    'dynamodb',
     'elasticsearch',
-    'memcache',
-    'pymemcache',
-    'couchbase',
-    'arangodb',
     'eventlet',
     'gevent',
+    'librabbitmq',
+    'lzma',
+    'memcache',
+    'mongodb',
     'msgpack',
-    'yaml',
+    'pymemcache',
+    'pyro',
     'redis',
-    'sqs',
-    'couchdb',
     'riak',
-    'zookeeper',
+    's3',
+    'slmq',
     'solar',
     'sqlalchemy',
-    'azureblockblob',
-    'librabbitmq',
-    'pyro',
-    'slmq',
+    'sqs',
     'tblib',
-    'consul',
-    'dynamodb',
-    'mongodb',
-    'cosmosdbsql',
-    's3',
+    'yaml',
+    'zookeeper',
+    'zstd'
 }
 
 # -*- Classifiers -*-