diff --git a/ChangeLog b/ChangeLog
index 69ec2063..4db65534 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-06-01  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Don't throw exception when Metalink document is empty(no file
+	element).  It is a valid Metalink document anyway.
+	* src/MetalinkHelper.cc
+	* src/download_helper.cc
+
 2010-06-01  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Fixed double memory free when Exception raised from
diff --git a/src/MetalinkHelper.cc b/src/MetalinkHelper.cc
index 3dfac182..a90a65ee 100644
--- a/src/MetalinkHelper.cc
+++ b/src/MetalinkHelper.cc
@@ -71,9 +71,6 @@ void MetalinkHelper::query
 (std::vector<SharedHandle<MetalinkEntry> >& result,
  const SharedHandle<Metalinker>& metalinker, const Option* option)
 {
-  if(metalinker->entries.empty()) {
-    throw DL_ABORT_EX("No file entry found. Probably, the metalink file is not configured properly or broken.");
-  }
   metalinker->queryEntry(result,
                          option->get(PREF_METALINK_VERSION),
                          option->get(PREF_METALINK_LANGUAGE),
diff --git a/src/download_helper.cc b/src/download_helper.cc
index ca43aa3d..571a317e 100644
--- a/src/download_helper.cc
+++ b/src/download_helper.cc
@@ -329,9 +329,6 @@ void createRequestGroupForMetalink
     dw->setString(metalinkData);
     Metalink2RequestGroup().generate(result, dw, option);
   }
-  if(result.empty()) {
-    throw DL_ABORT_EX(MSG_NO_FILES_TO_DOWNLOAD);
-  }
 }
 #endif // ENABLE_METALINK