diff --git a/.gitignore b/.gitignore
index 5e65a7c..2c20c6a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -228,3 +228,4 @@
 /cockpit-262.tar.xz
 /cockpit-263.tar.xz
 /cockpit-264.tar.xz
+/cockpit-265.tar.xz
diff --git a/cockpit.spec b/cockpit.spec
index dcf4be3..ae60e10 100644
--- a/cockpit.spec
+++ b/cockpit.spec
@@ -1,5 +1,5 @@
 # This spec file has been automatically updated
-Version:        264
+Version:        265
 Release: 1%{?dist}
 #
 # Copyright (C) 2014-2020 Red Hat, Inc.
@@ -52,7 +52,7 @@ Summary:        Web Console for Linux servers
 License:        LGPLv2+
 URL:            https://cockpit-project.org/
 
-Source0:        https://github.com/cockpit-project/cockpit/releases/download/264/cockpit-264.tar.xz
+Source0:        https://github.com/cockpit-project/cockpit/releases/download/265/cockpit-265.tar.xz
 
 # in RHEL 8 the source package is duplicated: cockpit (building basic packages like cockpit-{bridge,system})
 # and cockpit-appstream (building optional packages like cockpit-{pcp})
@@ -168,19 +168,13 @@ Recommends: subscription-manager-cockpit
 
 %check
 exec 2>&1
-# HACK: Fedora koji builders are very slow, unreliable, and inaccessible for debugging; https://github.com/cockpit-project/cockpit/issues/13909
-%if 0%{?fedora} >= 0
-%ifarch s390x
-%define testsuite_fail || true
-%endif
-%endif
 # HACK: RHEL i686 builders hang after running all tests; not a supported architecture, so don't bother
 %if 0%{?rhel} >= 8
 %ifarch i686
 %define testsuite_skip #
 %endif
 %endif
-%{?testsuite_skip} make -j4 check %{?testsuite_fail}
+%{?testsuite_skip} make -j$(nproc) check
 
 %install
 %make_install
@@ -191,7 +185,7 @@ rm -f %{buildroot}/%{_libdir}/cockpit/*.so
 install -D -p -m 644 AUTHORS COPYING README.md %{buildroot}%{_docdir}/cockpit/
 
 # only ship deprecated PatternFly API for stable releases
-%if 0%{?rhel} <= 8
+%if 0%{?rhel} == 8
     ln -s cockpit.css.gz %{buildroot}/%{_datadir}/cockpit/base1/patternfly.css.gz
 %endif
 
@@ -683,6 +677,9 @@ via PackageKit.
 
 # The changelog is automatically generated and merged
 %changelog
+* Wed Mar 16 2022 Cockpit Project <cockpituous@gmail.com> - 265-1
+- Update to upstream 265 release
+
 * Fri Feb 25 2022 Cockpit Project <cockpituous@gmail.com> - 264-1
 - Update to upstream 264 release
 
diff --git a/plans/upstream.fmf b/plans/upstream.fmf
index cb97e38..eac39fa 100644
--- a/plans/upstream.fmf
+++ b/plans/upstream.fmf
@@ -2,6 +2,6 @@ discover:
   how: fmf
   repository: https://github.com/cockpit-project/cockpit
   # FIXME: get rid of the hardcoding: https://github.com/psss/tmt/issues/585
-  ref: "264"
+  ref: "265"
 execute:
   how: tmt
diff --git a/sources b/sources
index 25fc78f..73c6aa0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cockpit-264.tar.xz) = 5e6cb0907e36964908be49eca4d7ea2bc515d40e01ecbd2334d1a54f7ad42ed3b1bec846fe184256074cb9ce6518da13d1d57c89d3feaf146c4682a00e513fa4
+SHA512 (cockpit-265.tar.xz) = 182692b65dd335a6a7af972a2881835ac6872892a6f68ed12346311def5613fbfaab592db5b8beb1528857bd59d24ecf0ada7849067a46d29f7038f033d8722b