diff --git a/gating.yaml b/gating.yaml
new file mode 100644
index 0000000..1af3453
--- /dev/null
+++ b/gating.yaml
@@ -0,0 +1,9 @@
+--- !Policy
+product_versions:
+  - fedora-*
+decision_context: bodhi_update_push_testing
+subject_type: koji_build
+rules:
+  - !PassingTestCaseRule {test_case_name: dist.depcheck}
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
+
diff --git a/pacemaker.spec b/pacemaker.spec
index 256e4c7..4d14ad5 100644
--- a/pacemaker.spec
+++ b/pacemaker.spec
@@ -5,7 +5,11 @@
 %global gname haclient
 
 ## Where to install Pacemaker documentation
+%if 0%{?rhel}
+%global pcmk_docdir %{_docdir}/%{name}-doc
+%else
 %global pcmk_docdir %{_docdir}/%{name}
+%endif
 
 ## GitHub entity that distributes source (for ease of using a fork)
 %global github_owner ClusterLabs
@@ -14,7 +18,7 @@
 ## can be incremented to build packages reliably considered "newer"
 ## than previously built packages with the same pcmkversion)
 %global pcmkversion 2.0.5
-%global specversion 2
+%global specversion 3
 
 ## Upstream commit (or git tag, such as "Pacemaker-" plus the
 ## {pcmkversion} macro for an official release) to use for this package
@@ -37,9 +41,13 @@
 ## Add option to create binaries with coverage analysis
 %bcond_with coverage
 
-## Add option to skip generating documentation
+## Add option to skip/enable generating documentation
 ## (the build tools aren't available everywhere)
-%bcond_with doc
+%if 0%{?rhel}
+  %bcond_with doc
+%else
+  %bcond_without doc
+%endif
 
 ## Add option to prefix package version with "0."
 ## (so later "official" packages will be considered updates)
@@ -168,7 +176,7 @@ BuildRequires: help2man gnutls-devel pam-devel pkgconfig(dbus-1)
 BuildRequires: pkgconfig(systemd)
 
 Requires:      corosync >= 2.0.0
-BuildRequires: corosync-devel >= 2.0.0
+BuildRequires: corosynclib-devel >= 2.0.0
 #XXX
 #BuildRequires: pkgconfig(libcpg)
 #BuildRequires: pkgconfig(libcfg)
@@ -279,7 +287,7 @@ Requires:      libtool-ltdl-devel%{?_isa} libuuid-devel%{?_isa}
 Requires:      libxml2-devel%{?_isa} libxslt-devel%{?_isa}
 Requires:      bzip2-devel%{?_isa} glib2-devel%{?_isa}
 Requires:      libqb-devel%{?_isa}
-Requires:      corosync-devel%{?_isa} >= 2.0.0
+Requires:      corosynclib-devel%{?_isa} >= 2.0.0
 
 %description libs-devel
 Pacemaker is an advanced, scalable High-Availability cluster resource
@@ -708,6 +716,14 @@ exit 0
 %license %{nagios_name}-%{nagios_hash}/COPYING
 
 %changelog
+* Fri Oct 30 2020 Klaus Wenninger <kwenning@redhat.com> - 2.0.5-0.3.rc2
+- revert dependency corosync-devel back to corosynclib-devel as long
+  as corosynclib-devel-package doesn't provide corosync-devel%{?_isa}
+  we would need for pacemaker-libs-devel to require
+- enable some basic gating-tests
+- re-add building documentation using publican to everything but ELN
+- rename doc-dir for ELN
+
 * Wed Oct 28 2020 Klaus Wenninger <kwenning@redhat.com> - 2.0.5-0.2.rc2
 - Update for new upstream tarball for release candidate: Pacemaker-2.0.5-rc2,
   includes fix for CVE-2020-25654
diff --git a/tests/inventory b/tests/inventory
new file mode 100755
index 0000000..52687db
--- /dev/null
+++ b/tests/inventory
@@ -0,0 +1,4 @@
+#!/bin/bash
+export TEST_DOCKER_EXTRA_ARGS="--network host"
+exec merge-standard-inventory "$@"
+
diff --git a/tests/tests.yml b/tests/tests.yml
new file mode 100644
index 0000000..71d4612
--- /dev/null
+++ b/tests/tests.yml
@@ -0,0 +1,14 @@
+---
+- hosts: localhost
+  roles:
+  - role: standard-test-basic
+    tags:
+    - classic
+    - container
+    tests:
+    - cts-regression:
+        dir: .
+        run: /usr/share/pacemaker/tests/cts-regression cli scheduler
+    required_packages:
+    - pacemaker
+    - pacemaker-cts