diff --git a/src/devices/tech/dalvik/configure.jd b/src/devices/tech/dalvik/configure.jd
index 5810928..407e8d0 100644
--- a/src/devices/tech/dalvik/configure.jd
+++ b/src/devices/tech/dalvik/configure.jd
@@ -318,6 +318,7 @@
   <li>dalvik.vm.image-dex2oat-Xms: initial heap size
   <li>dalvik.vm.image-dex2oat-Xmx: maximum heap size
   <li>dalvik.vm.image-dex2oat-filter: compiler filter option
+  <li>dalvik.vm.image-dex2oat-threads: number of threads to use
 </ul>
 
 <p>To control dex2oat while it’s compiling everything besides the boot image:</p>
@@ -328,6 +329,19 @@
   <li> dalvik.vm.dex2oat-filter: compiler filter option
 </ul>
 
+<p> On releases through Android 6.0 one additional option is provided for compiling everything
+besides the boot image: </p>
+<ul>
+  <li> dalvik.vm.dex2oat-threads: number of threads to use
+</ul>
+
+<p> Starting with Android 6.1 this becomes two additional options for compiling everything besides
+the boot image: </p>
+<ul>
+  <li> dalvik.vm.boot-dex2oat-threads: number of threads to use during boot time
+  <li> dalvik.vm.dex2oat-threads: number of threads to use after boot time
+</ul>
+
 <p>The options that control initial and maximum heap size for dex2oat should not
 be reduced since they could limit what applications can be compiled.</p>