diff --git a/ChangeLog.txt b/ChangeLog.txt
index 030ea8c5..868e3e8a 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,4 +1,6 @@
+Build:
 - Fix cjson include paths.
+- Fix build using WITH_TLS=no when the openssl headers aren't available.
 
 
 2.0.0 - 2020-12-03
diff --git a/src/password_mosq.c b/src/password_mosq.c
index 73b81976..62e06925 100644
--- a/src/password_mosq.c
+++ b/src/password_mosq.c
@@ -19,10 +19,12 @@ Contributors:
 #include "config.h"
 
 #include <errno.h>
-#include <openssl/opensslv.h>
-#include <openssl/evp.h>
-#include <openssl/rand.h>
-#include <openssl/buffer.h>
+#ifdef WITH_TLS
+#  include <openssl/opensslv.h>
+#  include <openssl/evp.h>
+#  include <openssl/rand.h>
+#  include <openssl/buffer.h>
+#endif
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>