diff --git a/res/values/strings.xml b/res/values/strings.xml
index 58a91efdb..879076d22 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -315,6 +315,11 @@
 	<!-- mosh port preference summary -->
 	<string name="hostpref_moshport_summary">"Port to request mosh-server use, or 0 for automatic"</string>
 
+	<!-- mosh server preference title -->
+	<string name="hostpref_moshserver_title">"Requested Mosh Server"</string>
+	<!-- mosh server preference summary -->
+	<string name="hostpref_moshserver_summary">"Path to mosh-server on the remote host"</string>
+
 	<!-- locale preference title -->
 	<string name="hostpref_locale_title">"Locale to send to server"</string>
 	<!-- locale preference summary -->
diff --git a/res/xml/host_prefs.xml b/res/xml/host_prefs.xml
index 5a51a4fba..4e1fd1b16 100644
--- a/res/xml/host_prefs.xml
+++ b/res/xml/host_prefs.xml
@@ -105,6 +105,12 @@
 		android:summary="@string/hostpref_moshport_summary"
 		/>
 
+	<EditTextPreference
+		android:key="moshserver"
+		android:title="@string/hostpref_moshserver_title"
+		android:summary="@string/hostpref_moshserver_summary"
+		/>
+
 	<EditTextPreference
 		android:key="locale"
 		android:title="@string/hostpref_locale_title"
diff --git a/src/org/woltage/irssiconnectbot/HostEditorActivity.java b/src/org/woltage/irssiconnectbot/HostEditorActivity.java
index e4ba5ab68..324f0f4d5 100644
--- a/src/org/woltage/irssiconnectbot/HostEditorActivity.java
+++ b/src/org/woltage/irssiconnectbot/HostEditorActivity.java
@@ -377,6 +377,7 @@ private void removeIrrelevantPrefs() {
 		if (!prot.equals(Mosh.PROTOCOL)) {
 			removePref(HostDatabase.FIELD_HOST_MOSHPORT);
 			removePref(HostDatabase.FIELD_HOST_LOCALE);
+                        removePref(HostDatabase.FIELD_HOST_MOSH_SERVER);
 		}
 		if (!prot.equals(Mosh.PROTOCOL) && !prot.equals(SSH.PROTOCOL)) {
 			removePref(HostDatabase.FIELD_HOST_COMPRESSION);
diff --git a/src/org/woltage/irssiconnectbot/bean/HostBean.java b/src/org/woltage/irssiconnectbot/bean/HostBean.java
index 909b02311..bec75430a 100644
--- a/src/org/woltage/irssiconnectbot/bean/HostBean.java
+++ b/src/org/woltage/irssiconnectbot/bean/HostBean.java
@@ -51,6 +51,7 @@ public class HostBean extends AbstractBean {
 	private String encoding = HostDatabase.ENCODING_DEFAULT;
 	private boolean stayConnected = false;
         private int moshPort = -1;
+        private String moshServer = null;
         private String locale = HostDatabase.LOCALE_DEFAULT;
 
 	public HostBean() {
@@ -211,6 +212,13 @@ public int getMoshPort() {
             return moshPort;
         }
 
+        public void setMoshServer(String moshServer) {
+            this.moshServer = moshServer;
+        }
+        public String getMoshServer() {
+            return moshServer;
+        }
+
         public void setLocale(String locale) {
             this.locale = locale;
         }
@@ -251,6 +259,7 @@ public ContentValues getValues() {
 		values.put(HostDatabase.FIELD_HOST_ENCODING, encoding);
 		values.put(HostDatabase.FIELD_HOST_STAYCONNECTED, stayConnected);
                 values.put(HostDatabase.FIELD_HOST_MOSHPORT, moshPort);
+                values.put(HostDatabase.FIELD_HOST_MOSH_SERVER, moshServer);
                 values.put(HostDatabase.FIELD_HOST_LOCALE, locale);
 
 		return values;
@@ -296,6 +305,9 @@ public boolean equals(Object o) {
                 if (moshPort != host.getMoshPort())
                     return false;
 
+                if (moshServer != host.getMoshServer())
+                    return false;
+
                 if (locale != host.getLocale())
                     return false;
 
diff --git a/src/org/woltage/irssiconnectbot/transport/Mosh.java b/src/org/woltage/irssiconnectbot/transport/Mosh.java
index 798d0df08..0e47f8ff0 100644
--- a/src/org/woltage/irssiconnectbot/transport/Mosh.java
+++ b/src/org/woltage/irssiconnectbot/transport/Mosh.java
@@ -160,8 +160,11 @@ protected void finishConnection() {
                             bridge.outputLine("ssh rejected our LANG environment variable: "+e.getMessage());
                         }
 
-                        String serverCommand = "mosh-server new -s";
-                        serverCommand += " -l LANG="+host.getLocale();
+                        String serverCommand = host.getMoshServer();
+                        if(serverCommand == null) {
+                            serverCommand = "mosh-server";
+                        }
+                        serverCommand += " new -s -l LANG="+host.getLocale();
                         if(host.getMoshPort() > 0) {
                             serverCommand += " -p "+host.getMoshPort();
                         }
diff --git a/src/org/woltage/irssiconnectbot/util/HostDatabase.java b/src/org/woltage/irssiconnectbot/util/HostDatabase.java
index 87cf0a677..f596934c6 100644
--- a/src/org/woltage/irssiconnectbot/util/HostDatabase.java
+++ b/src/org/woltage/irssiconnectbot/util/HostDatabase.java
@@ -47,7 +47,7 @@ public class HostDatabase extends RobustSQLiteOpenHelper {
 	public final static String TAG = "ConnectBot.HostDatabase";
 
 	public final static String DB_NAME = "hosts";
-	public final static int DB_VERSION = 24;
+	public final static int DB_VERSION = 25;
 
 	public final static String TABLE_HOSTS = "hosts";
 	public final static String FIELD_HOST_NICKNAME = "nickname";
@@ -70,6 +70,7 @@ public class HostDatabase extends RobustSQLiteOpenHelper {
 	public final static String FIELD_HOST_ENCODING = "encoding";
 	public final static String FIELD_HOST_STAYCONNECTED = "stayconnected";
         public final static String FIELD_HOST_MOSHPORT = "moshport";
+        public final static String FIELD_HOST_MOSH_SERVER = "moshserver";
         public final static String FIELD_HOST_LOCALE = "locale";
 
 	public final static String TABLE_PORTFORWARDS = "portforwards";
@@ -112,6 +113,7 @@ public class HostDatabase extends RobustSQLiteOpenHelper {
 
 	public final static String ENCODING_DEFAULT = Charset.defaultCharset().name();
         public final static String LOCALE_DEFAULT = "en_US.UTF-8";
+        public final static String MOSH_SERVER_DEFAULT = "mosh-server";
 
 	public final static long PUBKEYID_NEVER = -2;
 	public final static long PUBKEYID_ANY = -1;
@@ -176,6 +178,7 @@ public void onCreate(SQLiteDatabase db) {
 				+ FIELD_HOST_STAYCONNECTED + " TEXT, "
                                 + FIELD_HOST_MOSHPORT + " INTEGER DEFAULT 0, "
                                 + FIELD_HOST_LOCALE + " TEXT DEFAULT '" + LOCALE_DEFAULT + "' "
+                                + FIELD_HOST_MOSH_SERVER + " TEXT DEFAULT '" + MOSH_SERVER_DEFAULT + "', "
                                 + ")");
 
 		db.execSQL("CREATE TABLE " + TABLE_PORTFORWARDS
@@ -275,6 +278,9 @@ public void onRobustUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) t
 		case 23:
 			db.execSQL("ALTER TABLE " + TABLE_PORTFORWARDS
 					+ " ADD COLUMN " + FIELD_PORTFORWARD_BINDADDR + " TEXT");
+                case 24:
+                        db.execSQL("ALTER TABLE " + TABLE_HOSTS
+                                + " ADD COLUMN " + FIELD_HOST_MOSH_SERVER + " TEXT DEFAULT '" + MOSH_SERVER_DEFAULT + "'");
 		}
 	}
 
@@ -400,6 +406,7 @@ private List<HostBean> createHostBeans(Cursor c) {
 			COL_ENCODING = c.getColumnIndexOrThrow(FIELD_HOST_ENCODING),
 			COL_STAYCONNECTED = c.getColumnIndexOrThrow(FIELD_HOST_STAYCONNECTED),
                         COL_MOSHPORT = c.getColumnIndexOrThrow(FIELD_HOST_MOSHPORT),
+                        COL_MOSH_SERVER = c.getColumnIndexOrThrow(FIELD_HOST_MOSH_SERVER),
                         COL_LOCALE = c.getColumnIndexOrThrow(FIELD_HOST_LOCALE);
 
 
@@ -425,6 +432,7 @@ private List<HostBean> createHostBeans(Cursor c) {
 			host.setEncoding(c.getString(COL_ENCODING));
 			host.setStayConnected(Boolean.valueOf(c.getString(COL_STAYCONNECTED)));
                         host.setMoshPort(c.getInt(COL_MOSHPORT));
+                        host.setMoshServer(c.getString(COL_MOSH_SERVER));
                         host.setLocale(c.getString(COL_LOCALE));
 
 			hosts.add(host);