diff --git a/machines/Dockerfile-fedora42 b/machines/Dockerfile-fedora42
new file mode 100644
index 0000000..b5c0dc9
--- /dev/null
+++ b/machines/Dockerfile-fedora42
@@ -0,0 +1,117 @@
+FROM fedora:42
+LABEL Description="Fedora 42 with build dependencies for shared"
+# Override the language to force UTF-8 output
+ENV LANG=C.UTF-8
+
+RUN \
+    dnf install -q -y --setopt=deltarpm=false dnf5 && \
+    dnf5 update -q -y --setopt=deltarpm=false && \
+    dnf5 install -q -y --setopt=deltarpm=false \
+        cargo \
+        clang \
+        coq \
+        diffutils \
+        elfutils-libelf-devel \
+        gcc \
+        gdb \
+        glibc-devel.x86_64 \
+        glibc-devel.i686 \
+        gmp-devel.x86_64 \
+        gmp-devel.i686 \
+        gtk3-devel \
+        java-11-openjdk-devel \
+        kernel \
+        kernel-devel \
+        libmnl-devel.i686 \
+        libmnl-devel.x86_64 \
+        m4 \
+        make \
+        mingw32-gcc \
+        mingw64-gcc \
+        numpy \
+        openssh \
+        openssl \
+        openssl-devel \
+        openssl-devel-engine \
+        perl-Getopt-Long \
+        perl-Term-ANSIColor \
+        pkgconf \
+        pulseaudio-libs-devel \
+        python-unversioned-command \
+        python3 \
+        python3-cffi \
+        python3-cryptography \
+        python3-devel \
+        python3-gmpy2 \
+        python3-numpy \
+        python3-pillow \
+        python3-pycryptodomex \
+        python3-pynacl \
+        python3-setuptools \
+        python3-z3 \
+        SDL2-devel \
+        which \
+        wine \
+        xorg-x11-server-Xvfb && \
+    dnf5 clean all
+
+WORKDIR /shared
+RUN ln -s shared/machines/run_shared_test.sh /run_shared_test.sh
+COPY . /shared/
+
+CMD ["xvfb-run", "/run_shared_test.sh"]
+
+# make list-nobuild:
+#    Global blacklist: latex%
+#    In sub-directories:
+#       c:
+#       glossaries:
+#       java/keystore:
+#       linux:
+#       python:
+#       python/crypto:
+#       python/network:
+#       python/network/dnssec:
+#       python/processor:
+#       python/qrcode:
+#       rust:
+#       verification:
+#    With gcc -m32:
+#       Global blacklist: latex%
+#       In sub-directories:
+#          c: gtk_alpha_window openmp_matrix
+#          glossaries:
+#          java/keystore:
+#          linux: pulseaudio_echo sdl_v4l_video
+#          python:
+#          python/crypto:
+#          python/network:
+#          python/network/dnssec:
+#          python/processor:
+#          python/qrcode:
+#          rust:
+#          verification:
+#    Compilers:
+#       gcc -m64: ok
+#       gcc -m32: ok
+#       clang -m64: ok
+#       clang -m32: ok
+#       musl-gcc: not working
+#       x86_64-w64-mingw32-gcc: ok
+#       i686-w64-mingw32-gcc: ok
+#    Versions:
+#       gcc: gcc (GCC) 14.2.1 20240801 (Red Hat 14.2.1-1)
+#       clang: clang version 18.1.8 (Fedora 18.1.8-3.fc41)
+#       x86_64-w64-mingw32-gcc: x86_64-w64-mingw32-gcc (GCC) 14.2.1 20240801 (Fedora MinGW 14.2.1-1.fc42)
+#       i686-w64-mingw32-gcc: i686-w64-mingw32-gcc (GCC) 14.2.1 20240801 (Fedora MinGW 14.2.1-1.fc42)
+#       wine: wine-9.15 (Staging)
+#       Linux kernel: 6.11.0-0.rc6.20240905gitc763c4339688.52.fc42.x86_64
+#       /lib/ld-linux.so.2: ld.so (GNU libc) stable release version 2.40.
+#       python: Python 3.13.0rc1
+#       python3: Python 3.13.0rc1
+#       javac: javac 11.0.24
+#       java: openjdk 11.0.24 2024-07-16
+#       rustc: rustc 1.80.1 (3f5fd8dd4 2024-08-06) (Fedora 1.80.1-1.fc41)
+#       cargo: cargo 1.80.1 (376290515 2024-07-16)
+#       coqc: The Coq Proof Assistant, version 8.18.0 compiled with OCaml 5.2.0
+#       openssl: OpenSSL 3.2.2 4 Jun 2024 (Library: OpenSSL 3.2.2 4 Jun 2024)
diff --git a/machines/get_base_name.sh b/machines/get_base_name.sh
index dd97ffd..d8d0283 100755
--- a/machines/get_base_name.sh
+++ b/machines/get_base_name.sh
@@ -163,6 +163,9 @@ do
         *fedora41*)
             echo "fedora41"
             ;;
+        *fedora42*)
+            echo "fedora42"
+            ;;
 
         *)
             echo >&2 "Error: invalid name $NAME (from $1)"
diff --git a/machines/image_tags.json b/machines/image_tags.json
index 2e9a499..5657e27 100644
--- a/machines/image_tags.json
+++ b/machines/image_tags.json
@@ -41,6 +41,7 @@
   "fedora:39",
   "fedora:40",
   "fedora:41",
+  "fedora:42",
   "ubuntu:14.04",
   "ubuntu:16.04",
   "ubuntu:18.04",