diff --git a/net/mosh/Makefile b/net/mosh/Makefile
index 36824f94aac..37983dd7701 100644
--- a/net/mosh/Makefile
+++ b/net/mosh/Makefile
@@ -1,12 +1,8 @@
-# $OpenBSD: Makefile,v 1.5 2013/10/17 20:58:28 jca Exp $
-
-BROKEN-arm =		erratic runtime behaviour
+# $OpenBSD: Makefile,v 1.6 2015/09/11 11:47:41 jca Exp $
 
 COMMENT =		mobile shell
 
-DISTNAME =		mosh-1.2.4
-
-REVISION =		1
+DISTNAME =		mosh-1.2.4.95rc2
 
 CATEGORIES =		net
 
@@ -20,17 +16,25 @@ PERMIT_PACKAGE_CDROM =	Yes
 WANTLIB +=		c crypto m ncursesw protobuf pthread ssl stdc++ util
 WANTLIB +=		z
 
-MASTER_SITES =		${HOMEPAGE}
+MASTER_SITES =		https://github.com/keithw/mosh/archive/
 
 LIB_DEPENDS =		devel/protobuf
 
-MAKE_FLAGS =		CPPFLAGS='-Dbe16toh=betoh16 -Dbe64toh=betoh64'
-
 SEPARATE_BUILD =	Yes
-CONFIGURE_STYLE =	gnu
+CONFIGURE_STYLE =	autoconf automake
+AUTOCONF_VERSION =	2.69
+AUTOMAKE_VERSION =	1.14
 # --enable-hardening forces PIE on, which doesn't work on all arches
 # pick only ld(1) -z now to match upstream
 CONFIGURE_ARGS =	--disable-hardening
-CONFIGURE_ENV =		ac_cv_have_decl_htobe64=yes LDFLAGS="-Wl,-z,now"
+CONFIGURE_ENV =		LDFLAGS="-Wl,-z,now ${LDFLAGS}"
+
+WRKDIST =		${WRKDIR}/mosh-${DISTNAME}
+
+post-patch:
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
+	    AUTOCONF_VERSION=${AUTOCONF_VERSION} \
+	    AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
+	    ./autogen.sh
 
 .include <bsd.port.mk>
diff --git a/net/mosh/distinfo b/net/mosh/distinfo
index 62e727a9458..0bc1ded48e6 100644
--- a/net/mosh/distinfo
+++ b/net/mosh/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mosh-1.2.4.tar.gz) = 500NMjImBG5ALdRpoXYHX8IBO2mw5nzqSXYslXF130Y=
-SIZE (mosh-1.2.4.tar.gz) = 283047
+SHA256 (mosh-1.2.4.95rc2.tar.gz) = VlcfscuclxQBOrD8gThj1Y4PXH0yBDCqBd+VIpXgRqc=
+SIZE (mosh-1.2.4.95rc2.tar.gz) = 166814
diff --git a/net/mosh/patches/patch-src_crypto_ocb_cc b/net/mosh/patches/patch-src_crypto_ocb_cc
index 5566ef7fadd..cfd231ded66 100644
--- a/net/mosh/patches/patch-src_crypto_ocb_cc
+++ b/net/mosh/patches/patch-src_crypto_ocb_cc
@@ -1,14 +1,14 @@
-$OpenBSD: patch-src_crypto_ocb_cc,v 1.1 2013/10/09 07:33:41 jca Exp $
+$OpenBSD: patch-src_crypto_ocb_cc,v 1.2 2015/09/11 11:47:41 jca Exp $
 Use generic code on ARM instead of asm because of some unsupported
 instructions.
 Introduced by https://github.com/keithw/mosh/issues/86
---- src/crypto/ocb.cc.orig	Tue Oct  8 11:57:42 2013
-+++ src/crypto/ocb.cc	Tue Oct  8 11:58:01 2013
+--- src/crypto/ocb.cc.orig	Sat Jun 27 00:28:46 2015
++++ src/crypto/ocb.cc	Mon Jun 29 23:20:32 2015
 @@ -298,7 +298,7 @@
          return swap_if_le(rval);
  	}
  
--	#if __GNUC__ && __arm__
+-	#if __GNUC__ && !__clang__ && __arm__
 +	#if 0
  	static inline block double_block(block b) {
  		__asm__ ("adds %1,%1,%1\n\t"
diff --git a/net/mosh/patches/patch-src_network_transportfragment_cc b/net/mosh/patches/patch-src_network_transportfragment_cc
index f1889be3236..e69de29bb2d 100644
--- a/net/mosh/patches/patch-src_network_transportfragment_cc
+++ b/net/mosh/patches/patch-src_network_transportfragment_cc
@@ -1,11 +0,0 @@
-$OpenBSD: patch-src_network_transportfragment_cc,v 1.1.1.1 2013/04/21 19:46:37 sthen Exp $
---- src/network/transportfragment.cc.orig	Fri Feb 15 04:18:44 2013
-+++ src/network/transportfragment.cc	Fri Feb 15 04:18:59 2013
-@@ -30,6 +30,7 @@
-     also delete it here.
- */
- 
-+#include <sys/types.h>
- #include <assert.h>
- 
- #include "byteorder.h"
diff --git a/net/mosh/pkg/MESSAGE b/net/mosh/pkg/MESSAGE
new file mode 100644
index 00000000000..148dcb94cbb
--- /dev/null
+++ b/net/mosh/pkg/MESSAGE
@@ -0,0 +1,3 @@
+N.B. At the time of writing, JuiceSSH's default server command is
+incorrect for use with mosh-1.2.5. To work-around, add -s in
+settings/mosh/Server Command.