diff --git a/src/freedombone-client b/src/freedombone-client
index c6d42f20..c6fe99e4 100755
--- a/src/freedombone-client
+++ b/src/freedombone-client
@@ -32,6 +32,7 @@ export TEXTDOMAIN=${PROJECT_NAME}-client
 export TEXTDOMAINDIR="/usr/share/locale"
 
 CURR_USER=$USER
+MESH_CLIENT_INSTALL=
 
 # Version number of this script
 VERSION="1.01"
@@ -102,7 +103,7 @@ function configure_monkeysphere {
 
 function show_help {
 	echo ''
-	echo $"${PROJECT_NAME}-client"
+	echo $"${PROJECT_NAME}-client --mesh [yes|no]"
 	echo ''
 	exit 0
 }
@@ -123,6 +124,10 @@ do
 			shift
 			WIFI_CHANNEL=${1}
 			;;
+		--mesh)
+			shift
+			MESH_CLIENT_INSTALL=${1}
+			;;
 		*)
 			# unknown option
 			;;
@@ -133,7 +138,9 @@ done
 echo $'Configuring client'
 configure_ssh_client
 configure_monkeysphere
-${PROJECT_NAME}-mesh-install batman_client
-${PROJECT_NAME}-mesh-install babel_client
+if [[ $MESH_CLIENT_INSTALL == $'yes' || $MESH_CLIENT_INSTALL == $'y' || $MESH_CLIENT_INSTALL == $'on' ]]; then
+	${PROJECT_NAME}-mesh-install batman_client
+	${PROJECT_NAME}-mesh-install babel_client
+fi
 echo $'Configuration complete'
 exit 0