diff --git a/.cirrus.yml b/.cirrus.yml
index 9c82634..028eddf 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -81,20 +81,20 @@ env:
 # Linux EOL timelines: https://linuxlifecycle.com/
 # Fedora (~13 months): https://fedoraproject.org/wiki/Fedora_Release_Life_Cycle
 
-fedora40_task:
+fedora41_task:
   container:
-    # Fedora 40 EOL: Around May 2025
-    dockerfile: ci/fedora-40/Dockerfile
+    # Fedora 41 EOL: Around Nov 2025
+    dockerfile: ci/fedora-41/Dockerfile
     << : *RESOURCES_TEMPLATE
   << : *CI_TEMPLATE
+  << : *SKIP_TASK_ON_PR
 
-fedora39_task:
+fedora40_task:
   container:
-    # Fedora 39 EOL: Around Nov 2024
-    dockerfile: ci/fedora-39/Dockerfile
+    # Fedora 40 EOL: Around May 2025
+    dockerfile: ci/fedora-40/Dockerfile
     << : *RESOURCES_TEMPLATE
   << : *CI_TEMPLATE
-  << : *SKIP_TASK_ON_PR
 
 centosstream9_task:
   container:
@@ -149,10 +149,17 @@ opensuse_tumbleweed_task:
   << : *CI_TEMPLATE
   << : *SKIP_TASK_ON_PR
 
+ubuntu24_10_task:
+  container:
+    # Ubuntu 24.10 EOL: 2025-07-30
+    dockerfile: ci/ubuntu-24.10/Dockerfile
+    << : *RESOURCES_TEMPLATE
+  << : *CI_TEMPLATE
+
 ubuntu24_task:
   container:
     # Ubuntu 24.04 EOL: Jun 2029
-    dockerfile: ci/ubuntu-22.04/Dockerfile
+    dockerfile: ci/ubuntu-24.04/Dockerfile
     << : *RESOURCES_TEMPLATE
   << : *CI_TEMPLATE
 
@@ -201,7 +208,7 @@ macos_ventura_task:
 freebsd14_task:
   freebsd_instance:
     # FreeBSD 14 EOL: Nov 30 2028
-    image_family: freebsd-14-0
+    image_family: freebsd-14-1
     << : *FREEBSD_RESOURCES_TEMPLATE
 
   prepare_script: ./ci/freebsd/prepare.sh
@@ -211,7 +218,7 @@ freebsd14_task:
 freebsd13_task:
   freebsd_instance:
     # FreeBSD 13 EOL: January 31, 2026
-    image_family: freebsd-13-3
+    image_family: freebsd-13-4
     << : *FREEBSD_RESOURCES_TEMPLATE
 
   prepare_script: ./ci/freebsd/prepare.sh
diff --git a/CHANGES b/CHANGES
index ec8be7a..365cafc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,11 @@
+0.61.0-37 | 2024-12-06 00:04:26 -0800
+
+  * CI: add Ubuntu 24.10 and actually test 24.04 :-) (Christian Kreibich, Corelight)
+
+  * CI: bump FreeBSD to 13.4 and 14.1, respectively (Christian Kreibich, Corelight)
+
+  * CI: drop Fedora 39, add 41 (Christian Kreibich, Corelight)
+
 0.61.0-33 | 2024-07-24 13:30:00 -0700
 
   * Format output closer to what clang-format would output (Tim Wojtulewicz, Corelight)
diff --git a/README b/README
index 1ba93ef..2f7993a 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 ..	-*- mode: rst-mode -*-
 ..
 .. Version number is filled in automatically.
-.. |version| replace:: 0.61.0-33
+.. |version| replace:: 0.61.0-37
 
 ======
 BinPAC
diff --git a/VERSION b/VERSION
index f303b25..f72a7bc 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.61.0-33
+0.61.0-37
diff --git a/ci/fedora-39/Dockerfile b/ci/fedora-41/Dockerfile
similarity index 86%
rename from ci/fedora-39/Dockerfile
rename to ci/fedora-41/Dockerfile
index 0beb216..0d0c7af 100644
--- a/ci/fedora-39/Dockerfile
+++ b/ci/fedora-41/Dockerfile
@@ -1,8 +1,8 @@
-FROM fedora:39
+FROM fedora:41
 
 # A version field to invalidate Cirrus's build cache when needed, as suggested in
 # https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
-ENV DOCKERFILE_VERSION 20231213
+ENV DOCKERFILE_VERSION 20241204
 
 RUN dnf -y install \
     bison \
diff --git a/ci/ubuntu-24.10/Dockerfile b/ci/ubuntu-24.10/Dockerfile
new file mode 100644
index 0000000..4cc56ec
--- /dev/null
+++ b/ci/ubuntu-24.10/Dockerfile
@@ -0,0 +1,18 @@
+FROM ubuntu:24.10
+
+ENV DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles"
+
+# A version field to invalidate Cirrus's build cache when needed, as suggested in
+# https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
+ENV DOCKERFILE_VERSION 20241204
+
+RUN apt-get update && apt-get -y install \
+    bison \
+    cmake \
+    flex \
+    g++ \
+    gcc \
+    git \
+    make \
+  && apt autoclean \
+  && rm -rf /var/lib/apt/lists/*