diff --git a/ChangeLog b/ChangeLog
index 62e5a8cab..af3f2362e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -63,6 +63,7 @@ Changes
      test CRTs are available because MBEDTLS_PEM_PARSE_C is disabled.
      Fixes #2254.
    * 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.7.10 branch released 2019-03-19
 
diff --git a/programs/Makefile b/programs/Makefile
index b4a553a93..d38b9e7fd 100644
--- a/programs/Makefile
+++ b/programs/Makefile
@@ -276,6 +276,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