diff --git a/Dockerfile b/Dockerfile
index 2f6387c5..46f1f018 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,22 +1,22 @@
 ARG PLATFORM=amd64
-FROM ${PLATFORM}/alpine:3.10 AS build
+FROM ${PLATFORM}/alpine:3.18 AS build
 
 WORKDIR /build
 
-RUN apk add --no-cache wget cmake make gcc g++ linux-headers zlib-dev openssl-dev \
-            automake autoconf libevent-dev ncurses-dev msgpack-c-dev libexecinfo-dev \
-            ncurses-static libexecinfo-static libevent-static msgpack-c ncurses-libs \
-            libevent libexecinfo openssl zlib
+RUN apk add --no-cache wget cmake make gcc g++ linux-headers openssl-libs-static openssl-dev \
+            automake autoconf libevent-dev ncurses-dev msgpack-c-dev  \
+            ncurses-libs ncurses-static ncurses-dev libevent-static msgpack-c  \
+            libevent openssl zlib zlib-dev zlib-static
 
 RUN set -ex; \
             mkdir -p /src/libssh/build; \
             cd /src; \
-            wget -O libssh.tar.xz https://www.libssh.org/files/0.9/libssh-0.9.0.tar.xz; \
+            wget -O libssh.tar.xz https://www.libssh.org/files/0.10/libssh-0.10.5.tar.xz; \
             tar -xf libssh.tar.xz -C /src/libssh --strip-components=1; \
             cd /src/libssh/build; \
             cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr \
             -DWITH_SFTP=OFF -DWITH_SERVER=OFF -DWITH_PCAP=OFF \
-            -DWITH_STATIC_LIB=ON -DWITH_GSSAPI=OFF ..; \
+            -DBUILD_SHARED_LIBS=OFF -DWITH_GSSAPI=OFF ..; \
             make -j $(nproc); \
             make install
 
@@ -28,7 +28,7 @@ RUN make -j $(nproc)
 RUN objcopy --only-keep-debug tmate tmate.symbols && chmod -x tmate.symbols && strip tmate
 RUN ./tmate -V
 
-FROM alpine:3.9
+FROM alpine:3.18
 
 RUN apk --no-cache add bash
 RUN mkdir /build
diff --git a/compat/setenv.c b/compat/setenv.c
index b16b08cf..a13755b0 100644
--- a/compat/setenv.c
+++ b/compat/setenv.c
@@ -21,7 +21,7 @@
 #include "tmux.h"
 
 int
-setenv(const char *name, const char *value, unused int overwrite)
+setenv(const char *name, const char *value, __unused int overwrite)
 {
 	char	*newval;
 
diff --git a/configure.ac b/configure.ac
index 028d5559..2b96973d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -207,7 +207,19 @@ PKG_CHECK_MODULES(
     LIBS="$MSGPACK_LIBS $LIBS"
     found_msgpack=yes
   ],
-  found_msgpack=no
+	[
+    # msgpack.pc was renamed to msgpack-c.pc in 6.0.0.
+    PKG_CHECK_MODULES(
+      MSGPACKC,
+      msgpack-c >= 1.1.0,
+      [
+        CPPFLAGS="$MSGPACKC_CFLAGS $CPPFLAGS"
+        LIBS="$MSGPACKC_LIBS $LIBS"
+        found_msgpack=yes
+      ],
+      found_msgpack=no
+    )
+  ]
 )
 if test "x$found_msgpack" = xno; then
   AC_MSG_ERROR("msgpack >= 1.1.0 not found")