diff --git a/0001-Deactivate-markdown-doc.patch b/0001-Deactivate-markdown-doc.patch
new file mode 100644
index 0000000..92e048d
--- /dev/null
+++ b/0001-Deactivate-markdown-doc.patch
@@ -0,0 +1,25 @@
+diff -Naur a/llvm/docs/conf.py b/llvm/docs/conf.py
+--- a/llvm/docs/conf.py	2020-09-15 09:12:24.318287611 +0000
++++ b/llvm/docs/conf.py	2020-09-15 15:01:00.025893199 +0000
+@@ -36,20 +36,7 @@
+     '.rst': 'restructuredtext',
+ }
+ 
+-try:
+-  import recommonmark
+-except ImportError:
+-  # manpages do not use any .md sources
+-  if not tags.has('builder-man'):
+-    raise
+-else:
+-  import sphinx
+-  if sphinx.version_info >= (3, 0):
+-    # This requires 0.5 or later.
+-    extensions.append('recommonmark')
+-  else:
+-    source_parsers = {'.md': 'recommonmark.parser.CommonMarkParser'}
+-  source_suffix['.md'] = 'markdown'
++import sphinx
+ 
+ # The encoding of source files.
+ #source_encoding = 'utf-8-sig'
diff --git a/llvm11.spec b/llvm11.spec
index 2b65038..2efa3ce 100644
--- a/llvm11.spec
+++ b/llvm11.spec
@@ -11,7 +11,7 @@
 %global llvm_libdir %{_libdir}/%{name}
 %global build_llvm_libdir %{buildroot}%{llvm_libdir}
 #global rc_ver 2
-%global baserelease 5
+%global baserelease 6
 %global llvm_srcdir llvm-%{version}%{?rc_ver:rc%{rc_ver}}.src
 %global maj_ver 11
 %global min_ver 1
@@ -64,6 +64,9 @@ Patch2:     0001-gcc11.patch
 Patch3:		0001-SystemZ-Assign-the-full-space-for-promoted-and-split.patch
 Patch4:		0001-MemCpyOpt-Correctly-merge-alias-scopes-during-call-s.patch
 
+# RHEL-specific patches
+Patch101:	0001-Deactivate-markdown-doc.patch
+
 BuildRequires:	gcc
 BuildRequires:	gcc-c++
 BuildRequires:	cmake
@@ -72,7 +75,9 @@ BuildRequires:	zlib-devel
 BuildRequires:	libffi-devel
 BuildRequires:	ncurses-devel
 BuildRequires:	python3-sphinx
+%if !0%{?rhel}
 BuildRequires:	python3-recommonmark
+%endif
 BuildRequires:	multilib-rpm-config
 %if %{with gold}
 BuildRequires:	binutils-devel
@@ -184,6 +189,12 @@ LLVM's modified googletest sources.
 %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
 %autosetup -n %{llvm_srcdir} -p2
 
+%ifarch s390x
+# 2 tests failing:
+mv test/tools/llvm-objcopy/ELF/compress-debug-sections-zlib.test{,.DISABLED}
+mv test/tools/llvm-objcopy/ELF/compress-debug-sections-zlib-gnu.test{,.DISABLED}
+%endif
+
 pathfix.py -i %{__python3} -pn \
 	test/BugPoint/compile-custom.ll.py \
 	tools/opt-viewer/*.py \
@@ -559,6 +570,10 @@ fi
 %endif
 
 %changelog
+* Sun Feb  6 2022 Jens Petersen <petersen@redhat.com> - 11.1.0-6
+- Remove dependency on python3-recommonmark (like RHEL9 llvm)
+- s390x: disable 2 llvm-objcopy/ELF/compress-debug-sections-zlib tests
+
 * Wed May 19 2021 sguelton@redhat.com - 11.1.0-5
 - Fix handling of llvm-config