diff --git a/pylsp-pr345-autopep8-2.patch b/pylsp-pr345-autopep8-2.patch
new file mode 100644
index 0000000..ee0df99
--- /dev/null
+++ b/pylsp-pr345-autopep8-2.patch
@@ -0,0 +1,22 @@
+diff --git a/pyproject.toml b/pyproject.toml
+index 8d38434..07c0345 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -27,7 +27,7 @@ Homepage = "https://github.com/python-lsp/python-lsp-server"
+ 
+ [project.optional-dependencies]
+ all = [
+-    "autopep8>=1.6.0,<1.7.0",
++    "autopep8>=1.6.0,<2.1.0",
+     "flake8>=5.0.0,<7",
+     "mccabe>=0.7.0,<0.8.0",
+     "pycodestyle>=2.9.0,<2.11.0",
+@@ -38,7 +38,7 @@ all = [
+     "yapf",
+     "whatthepatch>=1.0.2,<2.0.0"
+ ]
+-autopep8 = ["autopep8>=1.6.0,<1.7.0"]
++autopep8 = ["autopep8>=1.6.0,<2.1.0"]
+ flake8 = ["flake8>=5.0.0,<7"]
+ mccabe = ["mccabe>=0.7.0,<0.8.0"]
+ pycodestyle = ["pycodestyle>=2.9.0,<2.11.0"]
diff --git a/python-python-lsp-server.changes b/python-python-lsp-server.changes
index a713a84..d0649db 100644
--- a/python-python-lsp-server.changes
+++ b/python-python-lsp-server.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Jan 25 16:28:20 UTC 2023 - Ben Greiner <code@bnavigator.de>
+
+- Allow 1.6.0 <= autopep8 < 2.1
+  * Add pylsp-pr345-autopep8-2.patch
+  * gh#python-lsp/python-lsp-server#345
+- Fix yapf requirement for toml
+  * gh#python-lsp/python-lsp-server#346
+
 -------------------------------------------------------------------
 Thu Jan 19 10:10:31 UTC 2023 - Ben Greiner <code@bnavigator.de>
 
diff --git a/python-python-lsp-server.spec b/python-python-lsp-server.spec
index 41d8427..626c65f 100644
--- a/python-python-lsp-server.spec
+++ b/python-python-lsp-server.spec
@@ -25,17 +25,18 @@ URL:            https://github.com/python-lsp/python-lsp-server
 Source:         https://files.pythonhosted.org/packages/source/p/python-lsp-server/python-lsp-server-%{version}.tar.gz
 # PATCH-FIX-UPSTREAM pylsp-pr340-pydocstyle-6.3.patch gh#python-lsp/python-lsp-server#340
 Patch1:         pylsp-pr340-pydocstyle-6.3.patch
+# PATCH-FIX-UPSTREAM pylsp-pr345-autopep8-2.patch.patch gh#python-lsp/python-lsp-server#345
+Patch2:         pylsp-pr345-autopep8-2.patch
 BuildRequires:  %{python_module base >= 3.7}
 BuildRequires:  %{python_module pip}
 BuildRequires:  %{python_module setuptools >= 61.2}
 BuildRequires:  %{python_module setuptools_scm >= 3.4.3}
-BuildRequires:  %{python_module tomli}
 BuildRequires:  %{python_module wheel}
 BuildRequires:  python-rpm-macros >= 20210628
 # SECTION test requirements
 BuildRequires:  %{python_module docstring-to-markdown}
 BuildRequires:  %{python_module PyQt5}
-BuildRequires:  %{python_module autopep8 >= 1.6.0 with %python-autopep8 < 1.7.0}
+BuildRequires:  %{python_module autopep8 >= 1.6.0 with %python-autopep8 < 2.1.0}
 BuildRequires:  %{python_module flake8 >= 5.0.0 with %python-flake8 < 7}
 BuildRequires:  %{python_module flaky}
 BuildRequires:  %{python_module jedi >= 0.17.2 with %python-jedi < 0.19.0}
@@ -48,6 +49,8 @@ BuildRequires:  %{python_module pylint >= 2.5.0 with %python-pylint < 3}
 BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module python-lsp-jsonrpc >= 1.0.0}
 BuildRequires:  %{python_module rope >= 1.2.0}
+# gh#python-lsp/python-lsp-server#346
+BuildRequires:  %{python_module toml if %python-yapf <= 0.32.0 else %python-tomli}
 BuildRequires:  %{python_module ujson >= 3.0.0}
 BuildRequires:  %{python_module whatthepatch >= 1.0.2 with %python-whatthepatch < 2}
 BuildRequires:  %{python_module yapf}
@@ -60,7 +63,7 @@ Requires:       python-setuptools >= 39.0.0
 Requires:       python-ujson >= 3.0.0
 Requires:       (python-jedi >= 0.17.2 with python-jedi < 0.19.0)
 Suggests:       python-autopep8 >= 1.6.0
-Conflicts:      python-autopep8 >= 1.7.0
+Conflicts:      python-autopep8 >= 2.1.0
 Suggests:       python-pydocstyle >= 6.3.0
 Conflicts:      python-pydocstyle >= 6.4.0
 Suggests:       python-pylint >= 2.5.0