diff --git a/README.md b/README.md
index 06dbf71..5021917 100644
--- a/README.md
+++ b/README.md
@@ -216,18 +216,20 @@ Following variables affect the versions installed:
 * ```es_version``` (e.g. "1.5.2").  
 * ```es_start_service``` (true (default) or false)
 * ```es_plugins_reinstall``` (true or false (default) )
-* ```es_plugins``` (an array of plugin definitions e.g.:
-* ```es_allow_downgrades``` For development purposes only. (true or false (default) )
-* ```es_java_install``` If set to false, Java will not be installed. (true (default) or false)
-* ```update_java``` Updates Java to the latest version. (true or false (default))
-
-
-
-```
+* ```es_plugins``` an array of plugin definitions e.g.:
+```yml
   es_plugins:
     - plugin: elasticsearch-cloud-aws
       version: 2.5.0
 ```
+* ```es_allow_downgrades``` For development purposes only. (true or false (default) )
+* ```es_java_install``` If set to false, Java will not be installed. (true (default) or false)
+* ```update_java``` Updates Java to the latest version. (true or false (default))
+* ```es_java_opts``` an array of java options. E.g.:
+```yml
+es_java_opts:
+  - "-Djava.io.tmpdir=/data/tmp/elasticsearch"
+```
 
 Earlier examples illustrate the installation of plugins for 2.x.  The correct use of this parameter varies depending on the version of Elasticsearch being installed:
  
diff --git a/templates/elasticsearch.j2 b/templates/elasticsearch.j2
index fafb5e2..d934c67 100644
--- a/templates/elasticsearch.j2
+++ b/templates/elasticsearch.j2
@@ -33,7 +33,13 @@ ES_HEAP_SIZE={{es_heap_size}}
 #ES_DIRECT_SIZE=
 
 # Additional Java OPTS
+{% if es_java_opts is defined and es_java_opts %}
+{% for java_opt in es_java_opts %}
+ES_JAVA_OPTS="{{java_opt}}"
+{% endfor %}
+{% else %}
 #ES_JAVA_OPTS=
+{% endif %}
 
 # Configure restart on package upgrade (true, every other setting will lead to not restarting)
 #ES_RESTART_ON_UPGRADE=true