diff --git a/net/mosh/Portfile b/net/mosh/Portfile
index 4966e58904d..7b7456043da 100644
--- a/net/mosh/Portfile
+++ b/net/mosh/Portfile
@@ -5,7 +5,7 @@ PortGroup               perl5 1.0
 
 name                    mosh
 version                 1.4.0
-revision                2
+revision                3
 categories              net
 license                 {GPL-3+ OpenSSLException}
 maintainers             {mit.edu:quentin @quentinmit} \
@@ -44,8 +44,14 @@ post-patch {
         ${worksrcpath}/scripts/mosh.pl
 }
 
-#protobuf3-cpp requires c++11 now
-configure.cxxflags-append -std=c++11
+# https://github.com/protocolbuffers/protobuf/issues/9947
+configure.cflags-append   -DNDEBUG
+
+# avoid overlinking abseil
+configure.ldflags-append  -Wl,-dead_strip_dylibs
+
+# abseil uses C++17; use `gnu++17` as Mosh allows use of GNU extensions
+configure.cxxflags-append -std=gnu++17
 
 # force protobuf3-cpp into the no_threadlocal mode on older systems
 if { ${os.platform} eq "darwin" && ${os.major} < 11 } {
@@ -62,11 +68,9 @@ if {${os.platform} eq "darwin" && ${os.major} > 11} {
                         --with-crypto-library=openssl
 }
 
-post-destroot {
-    xinstall -d ${destroot}${prefix}/etc/bash_completion.d
-    copy ${worksrcpath}/conf/bash-completion/completions/mosh \
-         ${destroot}${prefix}/etc/bash_completion.d/mosh
-}
+configure.args-append \
+                    --enable-completion \
+                    --disable-silent-rules
 
 livecheck.type          regex
 livecheck.url           ${homepage}