diff --git a/ChangeLog b/ChangeLog
index 0097b791..7b7f6ef6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-09-05  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>
+
+	Added "Firefox3 Cookie" feature to FeatureConfig
+	* src/FeatureConfig.cc
+	* src/FeatureConfig.h
+	* test/FeatureConfigTest.cc
+
 2008-09-05  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>
 
 	Bump up version number to 0.16.0b
diff --git a/src/FeatureConfig.cc b/src/FeatureConfig.cc
index 62320178..e525a2a7 100644
--- a/src/FeatureConfig.cc
+++ b/src/FeatureConfig.cc
@@ -48,6 +48,7 @@ const std::string FeatureConfig::FEATURE_METALINK("Metalink");
 const std::string FeatureConfig::FEATURE_MESSAGE_DIGEST("Message Digest");
 const std::string FeatureConfig::FEATURE_ASYNC_DNS("Async DNS");
 const std::string FeatureConfig::FEATURE_GZIP("GZip");
+const std::string FeatureConfig::FEATURE_FIREFOX3_COOKIE("Firefox3 Cookie");
 
 #ifdef ENABLE_SSL
 # define HTTPS_ENABLED true
@@ -85,6 +86,12 @@ const std::string FeatureConfig::FEATURE_GZIP("GZip");
 # define GZIP_ENABLED false
 #endif // !HAVE_LIBZ
 
+#ifdef HAVE_SQLITE3
+# define FIREFOX3_COOKIE_ENABLED true
+#else // !HAVE_SQLITE3
+# define FIREFOX3_COOKIE_ENABLED false
+#endif // !HAVE_SQLITE3
+
 FeatureConfig::FeatureConfig() {
   _defaultPorts.insert(PortMap::value_type(Request::PROTO_HTTP, 80));
   _defaultPorts.insert(PortMap::value_type(Request::PROTO_HTTPS, 443));
@@ -97,6 +104,7 @@ FeatureConfig::FeatureConfig() {
     FeatureMap::value_type(FEATURE_MESSAGE_DIGEST, MESSAGE_DIGEST_ENABLED),
     FeatureMap::value_type(FEATURE_ASYNC_DNS, ASYNC_DNS_ENABLED),
     FeatureMap::value_type(FEATURE_GZIP, GZIP_ENABLED),
+    FeatureMap::value_type(FEATURE_FIREFOX3_COOKIE, FIREFOX3_COOKIE_ENABLED),
   };
 
   _features.insert(&featureArray[0], &featureArray[arrayLength(featureArray)]);
diff --git a/src/FeatureConfig.h b/src/FeatureConfig.h
index 9c69c3b5..29ac7a74 100644
--- a/src/FeatureConfig.h
+++ b/src/FeatureConfig.h
@@ -68,6 +68,7 @@ public:
   static const std::string FEATURE_MESSAGE_DIGEST;
   static const std::string FEATURE_ASYNC_DNS;
   static const std::string FEATURE_GZIP;
+  static const std::string FEATURE_FIREFOX3_COOKIE;
 };
 
 } // namespace aria2
diff --git a/test/FeatureConfigTest.cc b/test/FeatureConfigTest.cc
index 2909f6f5..db135c0b 100644
--- a/test/FeatureConfigTest.cc
+++ b/test/FeatureConfigTest.cc
@@ -58,6 +58,10 @@ void FeatureConfigTest::testFeatureSummary() {
     "BitTorrent",
 #endif // ENABLE_BITTORRENT
 
+#ifdef HAVE_SQLITE3
+    "Firefox3 Cookie",
+#endif // HAVE_SQLITE3
+
 #ifdef HAVE_LIBZ
     "GZip",
 #endif // HAVE_LIBZ