diff --git a/ec2/deploy.generic/root/spark-ec2/ec2-variables.sh b/ec2/deploy.generic/root/spark-ec2/ec2-variables.sh
index 7e10e09ba5841..3570891be804e 100644
--- a/ec2/deploy.generic/root/spark-ec2/ec2-variables.sh
+++ b/ec2/deploy.generic/root/spark-ec2/ec2-variables.sh
@@ -29,4 +29,4 @@ export SHARK_VERSION="{{shark_version}}"
 export HADOOP_MAJOR_VERSION="{{hadoop_major_version}}"
 export SWAP_MB="{{swap}}"
 export SPARK_WORKER_INSTANCES="{{spark_worker_instances}}"
-
+export SPARK_MASTER_OPTS="{{spark_master_opts}}"
diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py
index a84d6601fbb22..db393748a33bf 100755
--- a/ec2/spark_ec2.py
+++ b/ec2/spark_ec2.py
@@ -105,6 +105,9 @@ def parse_args():
       help="Launch fresh slaves, but use an existing stopped master if possible")
   parser.add_option("--worker-instances", type="int", default=1,
       help="Number of instances per worker: variable SPARK_WORKER_INSTANCES (default: 1)")
+  parser.add_option("--master-opts", type="string", default="",
+      help="Extra options to give to master through SPARK_MASTER_OPTS variable (e.g -Dspark.worker.timeout=180)")
+
 
 
   (opts, args) = parser.parse_args()
@@ -555,7 +558,8 @@ def deploy_files(conn, root_dir, opts, master_nodes, slave_nodes, modules):
     "spark_version": spark_v,
     "shark_version": shark_v,
     "hadoop_major_version": opts.hadoop_major_version,
-    "spark_worker_instances": "%d" % opts.worker_instances
+    "spark_worker_instances": "%d" % opts.worker_instances,
+    "spark_master_opts": opts.master_opts
   }
 
   # Create a temp directory in which we will place all the files to be