diff --git a/ChangeLog b/ChangeLog
index ca7bb880..be790a58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,7 +12,9 @@
 	* src/AbstractCommand.h: Replaced HAVE_LIBARES with ENABLE_ASYNC_DNS
 	* src/HttpInitiateConnectionCommand.h:
 	Replaced HAVE_LIBARES with ENABLE_ASYNC_DNS
-	* src/NameResolver.cc: Replaced HAVE_LIBARES with ENABLE_ASYNC_DNS
+	* src/NameResolver.cc: Replaced HAVE_LIBARES with ENABLE_ASYNC_DNS.
+	Added thes upport of c-ares's ares_strerror(the idea came from patch
+	#1542285 by tizianomueller)
 	* src/HttpInitiateConnectionCommand.cc:
 	Replaced HAVE_LIBARES with ENABLE_ASYNC_DNS
 	* src/FtpInitiateConnectionCommand.cc:
@@ -22,6 +24,11 @@
 	* src/DownloadEngine.cc:
 	Replaced HAVE_LIBARES with ENABLE_ASYNC_DNS	
 
+	To fix the bug that causes compilation failure with metalink-support
+	disabled(bug#1543587):
+
+	* src/main.cc: Fixed with the patch by tizianomueller.
+	
 2006-08-14  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>
 
 	* src/main.cc
diff --git a/src/main.cc b/src/main.cc
index 64aa5d39..6eae3e97 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -33,8 +33,6 @@
 #include "DownloadEngineFactory.h"
 #include "UrlRequestInfo.h"
 #include "TorrentRequestInfo.h"
-#include "MetalinkRequestInfo.h"
-#include "Xml2MetalinkProcessor.h"
 #include <deque>
 #include <algorithm>
 #include <time.h>
@@ -46,6 +44,11 @@ extern char* optarg;
 extern int optind, opterr, optopt;
 #include <getopt.h>
 
+#ifdef ENABLE_METALINK
+#include "MetalinkRequestInfo.h"
+#include "Xml2MetalinkProcessor.h"
+#endif
+
 #ifdef HAVE_LIBSSL
 // for SSL
 # include <openssl/err.h>