diff --git a/python-testfixtures.changes b/python-testfixtures.changes
index 4759142..1783de8 100644
--- a/python-testfixtures.changes
+++ b/python-testfixtures.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Dec 21 18:13:58 UTC 2021 - Ben Greiner <code@bnavigator.de>
+
+- Add testfixtures-pr167-sybil3.patch
+  * gh#simplistix/testfixtures#167
+
 -------------------------------------------------------------------
 Thu Oct  7 15:01:20 UTC 2021 - Ben Greiner <code@bnavigator.de>
 
diff --git a/python-testfixtures.spec b/python-testfixtures.spec
index 1d617ba..faa45fd 100644
--- a/python-testfixtures.spec
+++ b/python-testfixtures.spec
@@ -25,6 +25,8 @@ Summary:        A collection of helpers and mock objects for unit tests and doc
 License:        MIT
 URL:            https://github.com/Simplistix/testfixtures
 Source:         https://files.pythonhosted.org/packages/source/t/testfixtures/testfixtures-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM testfixtures-pr167-sybil3.patch -- gh#simplistix/testfixtures#167
+Patch0:         testfixtures-pr167-sybil3.patch
 BuildRequires:  %{python_module Django}
 BuildRequires:  %{python_module Twisted}
 BuildRequires:  %{python_module pytest >= 3.6}
diff --git a/testfixtures-pr167-sybil3.patch b/testfixtures-pr167-sybil3.patch
new file mode 100644
index 0000000..58e5bb5
--- /dev/null
+++ b/testfixtures-pr167-sybil3.patch
@@ -0,0 +1,88 @@
+Index: testfixtures-6.18.3/docs/conftest.py
+===================================================================
+--- testfixtures-6.18.3.orig/docs/conftest.py
++++ testfixtures-6.18.3/docs/conftest.py
+@@ -1,8 +1,16 @@
+ from doctest import REPORT_NDIFF, ELLIPSIS
+ 
+ from sybil import Sybil
+-from sybil.parsers.doctest import DocTestParser, FIX_BYTE_UNICODE_REPR
+-from sybil.parsers.codeblock import CodeBlockParser
++from sybil.parsers.doctest import DocTestParser
++try:
++    from sybil.parsers.doctest import FIX_BYTE_UNICODE_REPR
++except ImportError:
++    # sybil 3 removed the optionflag
++    FIX_BYTE_UNICODE_REPR = 0
++try:
++    from sybil.parsers.codeblock import PythonCodeBlockParser
++except ImportError:
++    from sybil.parsers.codeblock import CodeBlockParser as PythonCodeBlockParser
+ from sybil.parsers.capture import parse_captures
+ 
+ from testfixtures.compat import PY3
+@@ -13,7 +21,7 @@ if PY3:
+     pytest_collect_file = Sybil(
+         parsers=[
+             DocTestParser(optionflags=REPORT_NDIFF|ELLIPSIS|FIX_BYTE_UNICODE_REPR),
+-            CodeBlockParser(['print_function']),
++            PythonCodeBlockParser(['print_function']),
+             parse_captures,
+             FileParser('tempdir'),
+         ],
+Index: testfixtures-6.18.3/docs/django.txt
+===================================================================
+--- testfixtures-6.18.3.orig/docs/django.txt
++++ testfixtures-6.18.3/docs/django.txt
+@@ -23,7 +23,7 @@ Traceback (most recent call last):
+ AssertionError: SampleModel not as expected:
+ <BLANKLINE>
+ same:
+-[u'id']
++['id']
+ <BLANKLINE>
+ values differ:
+ 'value': 1 != 2
+@@ -38,7 +38,7 @@ Traceback (most recent call last):
+ AssertionError: SampleModel not as expected:
+ <BLANKLINE>
+ same:
+-[u'id']
++['id']
+ <BLANKLINE>
+ values differ:
+ 'value': 1 != 2
+@@ -70,7 +70,7 @@ Traceback (most recent call last):
+ AssertionError: SampleModel not as expected:
+ <BLANKLINE>
+ same:
+-['created', u'id', 'value']
++['created', 'id', 'value']
+ <BLANKLINE>
+ values differ:
+ 'not_editable': 1 != 2
+Index: testfixtures-6.18.3/testfixtures/tests/conftest.py
+===================================================================
+--- testfixtures-6.18.3.orig/testfixtures/tests/conftest.py
++++ testfixtures-6.18.3/testfixtures/tests/conftest.py
+@@ -1,6 +1,10 @@
+ from sybil import Sybil
+ from sybil.parsers.doctest import  DocTestParser
+-from sybil.parsers.codeblock import CodeBlockParser
++try:
++    from sybil.parsers.codeblock import PythonCodeBlockParser
++except ImportError:
++    # sybil < 3 has it under the old name
++    from sybil.parsers.codeblock import CodeBlockParser as PythonCodeBlockParser
+ from sybil.parsers.capture import parse_captures
+ 
+ from testfixtures import TempDirectory
+@@ -18,7 +22,7 @@ def sybil_teardown(namespace):
+ pytest_collect_file = Sybil(
+     parsers=[
+         DocTestParser(),
+-        CodeBlockParser(),
++        PythonCodeBlockParser(),
+         parse_captures,
+         FileParser('tempdir'),
+     ],