diff --git a/docs/src/conf.py b/docs/src/conf.py
index dc5b530..d228a35 100644
--- a/docs/src/conf.py
+++ b/docs/src/conf.py
@@ -15,7 +15,6 @@
     'sphinx.ext.autosummary',
     'sphinx.ext.extlinks',
     'sphinx.ext.napoleon',
-    'sphinx_autodoc_typehints',
     'sphinx_rtd_theme',
 ]
 
@@ -26,6 +25,9 @@
     'members': True,
     'show-inheritance': True,
 }
+autodoc_typehints = 'description'
+autoclass_content = 'both'
+python_use_unqualified_type_names = True
 
 html_theme = 'sphinx_rtd_theme'
 extlinks = {
diff --git a/docs/src/release_notes.rst b/docs/src/release_notes.rst
index ee73428..29e3588 100644
--- a/docs/src/release_notes.rst
+++ b/docs/src/release_notes.rst
@@ -12,6 +12,10 @@ Changed
 - Add fields to :class:`Request` and change their meaning to be in line with
   the new HTTPX interface (:issue:`250`)
 
+Added
+*****
+- Improved documentation for type hints and response models (:issue:`109`)
+
 3.7.1 (2021-05-04)
 ------------------
 Fixed
diff --git a/setup.py b/setup.py
index 7647ee3..8b6a11d 100644
--- a/setup.py
+++ b/setup.py
@@ -35,9 +35,8 @@
 
 extras_require = {
     'docs': [
-        'sphinx~=3.1',
+        'sphinx~=4.0',
         'sphinx-rtd-theme',
-        'sphinx-autodoc-typehints~=1.11'
     ],
     'tests': [
         'coverage',