diff --git a/python-lsp-server-pr316-flake8v6.patch b/python-lsp-server-pr316-flake8v6.patch
new file mode 100644
index 0000000..ddb1175
--- /dev/null
+++ b/python-lsp-server-pr316-flake8v6.patch
@@ -0,0 +1,101 @@
+Index: python-lsp-server-1.6.0/.github/workflows/static.yml
+===================================================================
+--- python-lsp-server-1.6.0.orig/.github/workflows/static.yml
++++ python-lsp-server-1.6.0/.github/workflows/static.yml
+@@ -21,7 +21,7 @@ jobs:
+       - uses: actions/cache@v1
+         with:
+           path: ~/.cache/pip
+-          key: static-pip-${{ hashFiles('setup.py') }}
++          key: static-pip-${{ hashFiles('pyproject.toml') }}
+           restore-keys: static-pip-
+       - uses: actions/checkout@v2
+       - uses: actions/setup-python@v2
+Index: python-lsp-server-1.6.0/.github/workflows/test-linux.yml
+===================================================================
+--- python-lsp-server-1.6.0.orig/.github/workflows/test-linux.yml
++++ python-lsp-server-1.6.0/.github/workflows/test-linux.yml
+@@ -26,7 +26,7 @@ jobs:
+       - uses: actions/cache@v1
+         with:
+           path: ~/.cache/pip
+-          key: ${{ runner.os }}-${{ matrix.PYTHON_VERSION }}-pip-${{ hashFiles('setup.py') }}
++          key: ${{ runner.os }}-${{ matrix.PYTHON_VERSION }}-pip-${{ hashFiles('pyproject.toml') }}
+           restore-keys: ${{ runner.os }}-${{ matrix.PYTHON_VERSION }}-pip-
+       - uses: actions/checkout@v2
+       - uses: actions/setup-python@v2
+@@ -34,7 +34,6 @@ jobs:
+           python-version: ${{ matrix.PYTHON_VERSION }}
+           architecture: 'x64'
+       - name: Create Jedi environment for testing
+-        if: matrix.PYTHON_VERSION != '2.7'
+         run: |
+           python3 -m venv /tmp/pyenv
+           /tmp/pyenv/bin/python -m pip install loghub
+Index: python-lsp-server-1.6.0/.github/workflows/test-mac.yml
+===================================================================
+--- python-lsp-server-1.6.0.orig/.github/workflows/test-mac.yml
++++ python-lsp-server-1.6.0/.github/workflows/test-mac.yml
+@@ -26,7 +26,7 @@ jobs:
+       - uses: actions/cache@v1
+         with:
+           path: ~/Library/Caches/pip
+-          key: ${{ runner.os }}-${{ matrix.PYTHON_VERSION }}-pip-${{ hashFiles('setup.py') }}
++          key: ${{ runner.os }}-${{ matrix.PYTHON_VERSION }}-pip-${{ hashFiles('pyproject.toml') }}
+           restore-keys: ${{ runner.os }}-${{ matrix.PYTHON_VERSION }}-pip-
+       - uses: actions/checkout@v2
+       - uses: actions/setup-python@v2
+@@ -34,7 +34,6 @@ jobs:
+           python-version: ${{ matrix.PYTHON_VERSION }}
+           architecture: 'x64'
+       - name: Create Jedi environment for testing
+-        if: matrix.PYTHON_VERSION != '2.7'
+         run: |
+           python3 -m venv /tmp/pyenv
+           /tmp/pyenv/bin/python -m pip install loghub
+Index: python-lsp-server-1.6.0/.github/workflows/test-win.yml
+===================================================================
+--- python-lsp-server-1.6.0.orig/.github/workflows/test-win.yml
++++ python-lsp-server-1.6.0/.github/workflows/test-win.yml
+@@ -26,7 +26,7 @@ jobs:
+       - uses: actions/cache@v1
+         with:
+           path: ~\AppData\Local\pip\Cache
+-          key: ${{ runner.os }}-${{ matrix.PYTHON_VERSION }}-pip-${{ hashFiles('setup.py') }}
++          key: ${{ runner.os }}-${{ matrix.PYTHON_VERSION }}-pip-${{ hashFiles('pyproject.toml') }}
+           restore-keys: ${{ runner.os }}-${{ matrix.PYTHON_VERSION }}-pip-
+       - uses: actions/checkout@v2
+       - uses: actions/setup-python@v2
+Index: python-lsp-server-1.6.0/pyproject.toml
+===================================================================
+--- python-lsp-server-1.6.0.orig/pyproject.toml
++++ python-lsp-server-1.6.0/pyproject.toml
+@@ -28,22 +28,22 @@ Homepage = "https://github.com/python-ls
+ [project.optional-dependencies]
+ all = [
+     "autopep8>=1.6.0,<1.7.0",
+-    "flake8>=5.0.0,<5.1.0",
++    "flake8>=5.0.0,<7",
+     "mccabe>=0.7.0,<0.8.0",
+-    "pycodestyle>=2.9.0,<2.10.0",
++    "pycodestyle>=2.9.0,<2.11.0",
+     "pydocstyle>=2.0.0",
+-    "pyflakes>=2.5.0,<2.6.0",
++    "pyflakes>=2.5.0,<3.1.0",
+     "pylint>=2.5.0",
+     "rope>=0.10.5",
+     "yapf",
+     "whatthepatch"
+ ]
+ autopep8 = ["autopep8>=1.6.0,<1.7.0"]
+-flake8 = ["flake8>=5.0.0,<5.1.0"]
++flake8 = ["flake8>=5.0.0,<7"]
+ mccabe = ["mccabe>=0.7.0,<0.8.0"]
+-pycodestyle = ["pycodestyle>=2.9.0,<2.10.0"]
++pycodestyle = ["pycodestyle>=2.9.0,<2.11.0"]
+ pydocstyle = ["pydocstyle>=2.0.0"]
+-pyflakes = ["pyflakes>=2.5.0,<2.6.0"]
++pyflakes = ["pyflakes>=2.5.0,<3.1.0"]
+ pylint = ["pylint>=2.5.0"]
+ rope = ["rope>0.10.5"]
+ yapf = ["yapf", "whatthepatch>=1.0.2,<2.0.0"]
diff --git a/python-python-lsp-server.changes b/python-python-lsp-server.changes
index 694cce0..f4009f4 100644
--- a/python-python-lsp-server.changes
+++ b/python-python-lsp-server.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Dec 19 21:37:19 UTC 2022 - Ben Greiner <code@bnavigator.de>
+
+- add python-lsp-server-pr316-flake8v6.patch
+  gh#python-lsp/python-lsp-server#316
+
 -------------------------------------------------------------------
 Sun Nov  6 15:10:39 UTC 2022 - Ben Greiner <code@bnavigator.de>
 
diff --git a/python-python-lsp-server.spec b/python-python-lsp-server.spec
index e973a3e..8c242a2 100644
--- a/python-python-lsp-server.spec
+++ b/python-python-lsp-server.spec
@@ -23,6 +23,8 @@ Summary:        Python Language Server for the Language Server Protocol
 License:        MIT
 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 python-lsp-server-pr316-flake8v6.patch gh#python-lsp/python-lsp-server#316
+Patch0:         python-lsp-server-pr316-flake8v6.patch
 BuildRequires:  %{python_module base >= 3.7}
 BuildRequires:  %{python_module pip}
 BuildRequires:  %{python_module setuptools >= 61.2}
@@ -34,7 +36,7 @@ BuildRequires:  python-rpm-macros >= 20210628
 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 flake8 >= 5.0.0 with %python-flake8 < 5.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}
 BuildRequires:  %{python_module matplotlib}
@@ -66,13 +68,13 @@ Suggests:       python-yapf
 Suggests:       python-whatthepatch
 # SECTION flake8 pins
 Suggests:       python-flake8 >= 5.0.0
-Conflicts:      python-flake8 >= 5.1.0
+Conflicts:      python-flake8 >= 7
 Suggests:       python-mccabe >= 0.7.0
 Conflicts:      python-mccabe >= 0.8.0
 Suggests:       python-pycodestyle >= 2.9.0
-Conflicts:      python-pycodestyle >= 2.10.0
+Conflicts:      python-pycodestyle >= 2.11.0
 Suggests:       python-pyflakes >= 2.5.0
-Conflicts:      python-pyflakes >= 2.6.0
+Conflicts:      python-pyflakes >= 3.1.0
 # /SECTION
 BuildArch:      noarch
 Requires(post): update-alternatives