diff --git a/ChangeLog b/ChangeLog
index 9b5456ec6..9016091e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -64,6 +64,7 @@ Changes
    * Change wording in the `mbedtls_ssl_conf_max_frag_len()`'s documentation to
      improve clarity. Fixes #2258.
    * Replace multiple uses of MD2 by SHA-256 in X.509 test suite. Fixes #821.
+   * Make `make clean` clean all programs always. Fixes #1862.
 
 = mbed TLS 2.16.1 branch released 2019-03-19
 
diff --git a/programs/Makefile b/programs/Makefile
index 28c747b76..d09949bbf 100644
--- a/programs/Makefile
+++ b/programs/Makefile
@@ -296,6 +296,8 @@ x509/req_app$(EXEXT): x509/req_app.c $(DEP)
 clean:
 ifndef WINDOWS
 	rm -f $(APPS)
+	-rm -f ssl/ssl_pthread_server$(EXEXT)
+	-rm -f test/cpp_dummy_build$(EXEXT)
 else
 	del /S /Q /F *.o *.exe
 endif