diff --git a/pagure/lib/query.py b/pagure/lib/query.py
index 86bda50..ae56119 100644
--- a/pagure/lib/query.py
+++ b/pagure/lib/query.py
@@ -4237,7 +4237,6 @@ def text2markdown(text, extended=True, readme=False):
         "markdown.extensions.def_list",
         "markdown.extensions.fenced_code",
         "markdown.extensions.tables",
-        "markdown.extensions.smart_strong",
         # All of the above are the .extra extensions
         # w/o the "attribute lists" one
         "markdown.extensions.admonition",
@@ -4245,6 +4244,16 @@ def text2markdown(text, extended=True, readme=False):
         "markdown.extensions.sane_lists",
         "markdown.extensions.toc",
     ]
+
+    # smart_strong is not an extension anymore in markdown 3.0+
+    try:
+        md_version = markdown.__version__.version_info
+    except AttributeError:  # pragma: no cover
+        md_version = markdown.__version_info__
+
+    if md_version < (3, 0, 0):
+        extensions.append("markdown.extensions.smart_strong")
+
     # Some extensions are enabled for READMEs and disabled otherwise
     if readme:
         extensions.extend(
diff --git a/tests/test_pagure_lib.py b/tests/test_pagure_lib.py
index 50ddab1..cbb81ad 100644
--- a/tests/test_pagure_lib.py
+++ b/tests/test_pagure_lib.py
@@ -5018,9 +5018,12 @@ class PagureLibtests(tests.Modeltests):
 
     def test_text2markdown_table(self):
         """ Test the text2markdown function with a markdown table. """
-        v = tuple([int(c) for c in markdown.version.split('.')])
+        try:
+            md_version = markdown.__version__.version_info
+        except AttributeError:
+            md_version = markdown.__version_info__
 
-        if v < (2, 6, 7):
+        if md_version < (2, 6, 7):
             raise unittest.case.SkipTest(
                 'Skipping on old markdown that do not strip the orientation row'
             )