diff --git a/.gitignore b/.gitignore
index 02eda3b..8671d37 100644
--- a/.gitignore
+++ b/.gitignore
@@ -196,3 +196,4 @@
 /cockpit-233.1.tar.xz
 /cockpit-234.tar.xz
 /cockpit-235.tar.xz
+/cockpit-236.tar.xz
diff --git a/cockpit.spec b/cockpit.spec
index f9deffe..12a14e1 100644
--- a/cockpit.spec
+++ b/cockpit.spec
@@ -1,6 +1,6 @@
 # This spec file has been automatically updated
-Version:        235
-Release: 1%{?dist}
+Version:        236
+Release: 2%{?dist}
 #
 # Copyright (C) 2014-2020 Red Hat, Inc.
 #
@@ -436,7 +436,6 @@ Recommends: (reportd >= 0.7.1 if abrt)
 # NPM modules which are also available as packages
 Provides: bundled(js-jquery) = 3.5.1
 Provides: bundled(js-moment) = 2.29.1
-Provides: bundled(nodejs-flot) = 0.8.3
 Provides: bundled(xstatic-bootstrap-datepicker-common) = 1.9.0
 Provides: bundled(xstatic-patternfly-common) = 3.59.5
 
@@ -698,6 +697,14 @@ via PackageKit.
 
 # The changelog is automatically generated and merged
 %changelog
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 236-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Thu Jan 21 2021 Martin Pitt <mpitt@redhat.com> - 236-1
+
+- fslist channels: Include properties of changed files
+- Internal stabilization work
+
 * Thu Jan 07 2021 Martin Pitt <mpitt@redhat.com> - 235-1
 
 - Login: Improved handling of SSH host keys
diff --git a/sources b/sources
index 40965c2..ce92e7d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cockpit-235.tar.xz) = 709b35fdeded99ec353f14e0fc5a5412fb5a8013dfb9d405e47386d9031a19354fa9941d3e57cfe5528f38a8ae98acd0a8dedd62835d185e83b064db9735aebf
+SHA512 (cockpit-236.tar.xz) = 48068d739f89ca8f270d3a1ca5d0a44c8938ad8171ba7304e4560f1b98771af18b38bd8ff518bd2a312437a9d297b3ac3417e6ebad65af0e29b18efbd0f92de0
diff --git a/tests/run-test.sh b/tests/run-test.sh
index 17ac424..6c9a76c 100755
--- a/tests/run-test.sh
+++ b/tests/run-test.sh
@@ -42,12 +42,12 @@ if [ -n "$test_optional" ]; then
     # pre-download cirros image for Machines tests
     bots/image-download cirros
 
+    # triggers SELinux violation
+    # See journal: SELinux is preventing /usr/libexec/qemu-kvm from open access on the file /var/lib/cockpittest/nfs_pool/nfs-volume-0.
+    EXCLUDES="$EXCLUDES TestMachinesDisks.testAddDiskNFS"
     # not investigated yet
     EXCLUDES="$EXCLUDES
-        TestMachines.testCreateThenInstall
-        TestMachines.testCreateFileSource
-        TestMachines.testCreateUrlSource
-        TestMachines.testVmNICs"
+        TestAutoUpdates.testPrivilegeChange"
 
     # TestUpdates: we can't run rebooting tests
     TESTS="$TESTS