diff --git a/.cirrus.yml b/.cirrus.yml
index a098789c59..4d78085b8d 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -3,6 +3,8 @@ env:
   FEATURES: huge
 
 freebsd_12_task:
+  only_if: $CIRRUS_TAG == ''
+  timeout_in: 20m
   freebsd_instance:
     image: freebsd-12-1-release-amd64
   install_script:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b6dd144fbb..25ac92f5dc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -231,7 +231,7 @@ jobs:
     runs-on: ubuntu-latest
 
     needs: linux
-    if: github.event_name != 'pull_request'
+    if: always() && github.event_name != 'pull_request'
 
     steps:
       - name: Parallel finished
diff --git a/src/version.c b/src/version.c
index 70ff9a457e..96aa9b0043 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2158,
 /**/
     2157,
 /**/