diff --git a/net/mosh/Makefile b/net/mosh/Makefile
index 54eb17380b6..ecf8b9b3e38 100644
--- a/net/mosh/Makefile
+++ b/net/mosh/Makefile
@@ -1,7 +1,6 @@
 COMMENT =		mobile shell
 
-DISTNAME =		mosh-1.3.2
-REVISION =		5
+DISTNAME =		mosh-1.4.0
 
 CATEGORIES =		net
 
@@ -25,9 +24,9 @@ COMPILER =		base-clang ports-gcc
 
 LIB_DEPENDS =		devel/protobuf
 
+USE_GMAKE =		Yes
 CONFIGURE_STYLE =	gnu
 # don't force PIE which doesn't work on all arches
-CONFIGURE_ENV =		ax_cv_check_cflags__Werror___fPIE=no \
-			ax_cv_check_cxxflags__Werror___fPIE=no
+CONFIGURE_ENV =		ax_cv_check_cxxflags__Werror___fPIE=no
 
 .include <bsd.port.mk>
diff --git a/net/mosh/distinfo b/net/mosh/distinfo
index ddabf0ba1db..589b60d0db6 100644
--- a/net/mosh/distinfo
+++ b/net/mosh/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mosh-1.3.2.tar.gz) = 2mAFc9+oJ9iM4RTg/tMCEGiTgbvc/1Q8kx5Nai6FEhY=
-SIZE (mosh-1.3.2.tar.gz) = 359574
+SHA256 (mosh-1.4.0.tar.gz) = hy5LE05d8pyJM9/xI1B4UFTS/Sg5ta5rVYexTbFGXd0=
+SIZE (mosh-1.4.0.tar.gz) = 393465
diff --git a/net/mosh/patches/patch-src_network_network_cc b/net/mosh/patches/patch-src_network_network_cc
deleted file mode 100644
index 2ca305e20f7..00000000000
--- a/net/mosh/patches/patch-src_network_network_cc
+++ /dev/null
@@ -1,15 +0,0 @@
-Ambiguous bind(2) call.
-https://github.com/mobile-shell/mosh/commit/e5f8a826ef9ff5da4cfce3bb8151f9526ec19db0
-
-Index: src/network/network.cc
---- src/network/network.cc.orig
-+++ src/network/network.cc
-@@ -335,7 +335,7 @@ bool Connection::try_bind( const char *addr, int port_
-       }
-     }
- 
--    if ( bind( sock(), &local_addr.sa, local_addr_len ) == 0 ) {
-+    if ( ::bind( sock(), &local_addr.sa, local_addr_len ) == 0 ) {
-       set_MTU( local_addr.sa.sa_family );
-       return true;
-     } else if ( i == search_high ) { /* last port to search */