diff --git a/srcpkgs/mosh/patches/cpp17.patch b/srcpkgs/mosh/patches/cpp17.patch
new file mode 100644
index 00000000000..5463adc2718
--- /dev/null
+++ b/srcpkgs/mosh/patches/cpp17.patch
@@ -0,0 +1,14 @@
+--- a/configure.ac	2022-10-27 05:29:47.000000000 +0200
++++ -	2023-07-08 13:19:05.270079012 +0200
+@@ -22,9 +22,9 @@
+ # automake 1.12 seems to require this, but automake 1.11 doesn't recognize it
+ m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
+ 
+-# Protobuf 3.6+ requires C++11.
++# Protobuf 3.6+ requires C++11., 4.2.2 with abseil requires C++17
+ AS_IF([pkg-config --atleast-version 3.6.0 protobuf],
+-  [AX_CXX_COMPILE_STDCXX([11])])
++  [AX_CXX_COMPILE_STDCXX([17])])
+ 
+ WARNING_CXXFLAGS=""
+ PICKY_CXXFLAGS=""
diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index 173ba14bcd4..d252a0c2975 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,9 +1,9 @@
 # Template file for 'mosh'
 pkgname=mosh
 version=1.4.0
-revision=3
+revision=4
 build_style=gnu-configure
-hostmakedepends="perl pkg-config protobuf"
+hostmakedepends="perl pkg-config protobuf autoconf automake"
 makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
 depends="perl-IO-Tty"
 short_desc="Mobile shell, remote terminal application that allows roaming"
@@ -16,4 +16,5 @@ checksum=872e4b134e5df29c8933dff12350785054d2fd2839b5ae6b5587b14db1465ddd
 pre_configure() {
 	# make local.test always succeed. It fails due to missing X server in chroot.
 	printf "%s\n" "#!/bin/sh" ":" > src/tests/local.test
+	autoreconf -fi
 }