diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/client/JobClientActor.java b/flink-runtime/src/main/java/org/apache/flink/runtime/client/JobClientActor.java
index f2a2e1bf9ec9d..e51946f09add7 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/client/JobClientActor.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/client/JobClientActor.java
@@ -25,6 +25,7 @@
 import akka.actor.Terminated;
 import akka.dispatch.Futures;
 import akka.dispatch.OnSuccess;
+import org.apache.flink.configuration.ConfigConstants;
 import org.apache.flink.runtime.akka.AkkaUtils;
 import org.apache.flink.runtime.akka.FlinkUntypedActor;
 import org.apache.flink.runtime.akka.ListeningBehaviour;
@@ -255,7 +256,9 @@ else if (message instanceof Terminated) {
 				if (hasJobBeenSubmitted()) {
 					submitter.tell(
 						decorateMessage(new Status.Failure(
-							new JobClientActorSubmissionTimeoutException("Job submission to the JobManager timed out."))),
+							new JobClientActorSubmissionTimeoutException("Job submission to the JobManager timed out. " +
+								"You may increase '" + ConfigConstants.AKKA_CLIENT_TIMEOUT + "' in case the JobManager " +
+								"needs more time to configure and confirm the job submission."))),
 						getSelf());
 				}