diff --git a/programs/Makefile b/programs/Makefile
index aca442644..f3140a19c 100644
--- a/programs/Makefile
+++ b/programs/Makefile
@@ -136,7 +136,7 @@ zstd-nogz : LZMA_MSG := $(NO_LZMA_MSG)
 xzstd : CPPFLAGS += $(ZLIBCPP) $(LZMACPP)
 xzstd : LDFLAGS += $(ZLIBLD) $(LZMALD)
 zstd zstd-nogz xzstd : CPPFLAGS += -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT)
-zstd zstd-nogz xzstd : $(ZSTDLIB_OBJ) zstdcli.o fileio.o bench.o datagen.o dibio.o
+zstd zstd-nogz xzstd : $(ZSTDLIB_FILES) zstdcli.o fileio.o bench.o datagen.o dibio.o
 	@echo "$(THREAD_MSG)"
 	@echo "$(ZLIB_MSG)"
 	@echo "$(LZMA_MSG)"
diff --git a/programs/zstd.1 b/programs/zstd.1
index c6b2c2742..b84ab3324 100644
--- a/programs/zstd.1
+++ b/programs/zstd.1
@@ -2,12 +2,15 @@
 .TH "ZSTD" "1" "April 2017" "zstd 1.1.5" "User Commands"
 .
 .SH "NAME"
-\fBzstd\fR \- zstd, unzstd, zstdcat \- Compress or decompress \.zst files
+\fBzstd\fR \- zstd, zstdmt, unzstd, zstdcat \- Compress or decompress \.zst files
 .
 .SH "SYNOPSIS"
 \fBzstd\fR [\fIOPTIONS\fR] [\-|<INPUT\-FILE>] [\-o <OUTPUT\-FILE>]
 .
 .P
+\fBzstdmt\fR is equivalent to \fBzstd \-T0\fR
+.
+.P
 \fBunzstd\fR is equivalent to \fBzstd \-d\fR
 .
 .P
@@ -98,7 +101,7 @@ unlocks high compression levels 20+ (maximum 22), using a lot more memory\. Note
 .
 .TP
 \fB\-T#\fR
-Compress using # threads (default: 1)\. This modifier is only available if \fBzstd\fR was compiled with multithreading support\.
+Compress using # threads (default: 1)\. If \fB#\fR is 0, attempt to detect the number of physical CPU cores and compress with that many threads\. This modified does nothing if \fBzstd\fR was compiled without multithread support\.
 .
 .TP
 \fB\-D file\fR
diff --git a/programs/zstd.1.md b/programs/zstd.1.md
index 07c36f683..4b918d8fd 100644
--- a/programs/zstd.1.md
+++ b/programs/zstd.1.md
@@ -1,11 +1,13 @@
-zstd(1) -- zstd, unzstd, zstdcat - Compress or decompress .zst files
-====================================================================
+zstd(1) -- zstd, zstdmt, unzstd, zstdcat - Compress or decompress .zst files
+============================================================================
 
 SYNOPSIS
 --------
 
 `zstd` [*OPTIONS*] [-|&lt;INPUT-FILE&gt;] [-o &lt;OUTPUT-FILE&gt;]
 
+`zstdmt` is equivalent to `zstd -T0`
+
 `unzstd` is equivalent to `zstd -d`
 
 `zstdcat` is equivalent to `zstd -dcf`
@@ -101,7 +103,9 @@ the last one takes effect.
     Note that decompression will also require more memory when using these levels.
 * `-T#`:
     Compress using # threads (default: 1).
-    This modifier is only available if `zstd` was compiled with multithreading support.
+    If `#` is 0, attempt to detect the number of physical CPU cores and compress with
+    that many threads.
+    This modified does nothing if `zstd` was compiled without multithread support.
 * `-D file`:
     use `file` as Dictionary to compress or decompress FILE(s)
 * `--nodictID`: