diff --git a/ChangeLog b/ChangeLog
index e16f8162..02a3eb77 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 1/5/16 started 8.4
 - many more wepsave options [Felix Bünemann]
+- added quant_table option to wepsave [Felix Bünemann]
 
 15/4/16 started 8.3.1
 - rename vips wrapper script, it was still vips-8.2, thanks Benjamin
diff --git a/libvips/foreign/foreign.c b/libvips/foreign/foreign.c
index 10fb231c..78b8ea76 100644
--- a/libvips/foreign/foreign.c
+++ b/libvips/foreign/foreign.c
@@ -2272,15 +2272,18 @@ vips_jpegload_buffer( void *buf, size_t len, VipsImage **out, ... )
  * If @quant_table is set and the version of libjpeg supports it
  * (e.g. mozjpeg >= 3.0) it selects the quantization table to use:
  *
- * * 0 Tables from JPEG Annex K (vips and libjpeg default)
- * * 1 Flat table
- * * 2 Table tuned for MSSIM on Kodak image set
- * * 3 Table from ImageMagick by N. Robidoux (current mozjpeg default)
- * * 4 Table tuned for PSNR-HVS-M on Kodak image set
- * * 5 Table from Relevance of Human Vision to JPEG-DCT Compression (1992)
- * * 6 Table from DCTune Perceptual Optimization of Compressed Dental X-Rays (1997)
- * * 7 Table from A Visual Detection Model for DCT Coefficient Quantization (1993)
- * * 8 Table from An Improved Detection Model for DCT Coefficient Quantization (1993)
+ * * 0 — Tables from JPEG Annex K (vips and libjpeg default)
+ * * 1 — Flat table
+ * * 2 — Table tuned for MSSIM on Kodak image set
+ * * 3 — Table from ImageMagick by N. Robidoux (current mozjpeg default)
+ * * 4 — Table tuned for PSNR-HVS-M on Kodak image set
+ * * 5 — Table from Relevance of Human Vision to JPEG-DCT Compression (1992)
+ * * 6 — Table from DCTune Perceptual Optimization of Compressed Dental 
+ *   X-Rays (1997)
+ * * 7 — Table from A Visual Detection Model for DCT Coefficient 
+ *   Quantization (1993)
+ * * 8 — Table from An Improved Detection Model for DCT Coefficient 
+ *   Quantization (1993)
  *
  * Quantization table 0 is the default in vips and libjpeg(-turbo), but it
  * tends to favor detail over color accuracy, producting colored patches and
diff --git a/libvips/foreign/vips2jpeg.c b/libvips/foreign/vips2jpeg.c
index 0c7bda5b..0f60a9ef 100644
--- a/libvips/foreign/vips2jpeg.c
+++ b/libvips/foreign/vips2jpeg.c
@@ -74,6 +74,8 @@
  * 	- don't write JFIF headers if we are stripping, thanks Benjamin
  * 13/4/16
  * 	- remove deleted exif fields more carefully
+ * 9/5/16 felixbuenemann
+ * 	- add quant_table
  */
 
 /*