diff --git a/.cirrus.yml b/.cirrus.yml
index 9512ca3..33863a3 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -11,7 +11,6 @@
     - name: FreeBSD 12.3
       freebsd_instance:
         image_family: freebsd-12-3
-  only_if: $CIRRUS_TAG == ''
   timeout_in: 20m
   install_script:
     - pkg update -f
@@ -26,3 +25,20 @@
     - pw useradd cirrus -m
     - chown -R cirrus:cirrus .
     - sudo -u cirrus make test
+
+macos_task:
+  name: macOS m1
+  macos_instance:
+    image: ghcr.io/cirruslabs/macos-ventura-xcode:latest
+  timeout_in: 20m
+  install_script:
+    - uname -a
+    - brew update
+    - brew install gettext libtool
+  build_script:
+    - NPROC=$(getconf _NPROCESSORS_ONLN)
+    - ./configure --with-features=${FEATURES} --disable-channel
+    - make -j${NPROC} CC=clang
+  test_script:
+    - src/vim --version
+    - make CC=clang test
diff --git a/src/version.c b/src/version.c
index 1061e4c..eb6ad87 100644
--- a/src/version.c
+++ b/src/version.c
@@ -700,6 +700,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    580,
+/**/
     579,
 /**/
     578,