diff --git a/ChangeLog b/ChangeLog
index 06f6d70d..1096e82e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-09-23  Ross Smith II  <aria2spam at smithii dot com>
+
+	Add check for fork(), which is missing on MinGW
+	* src/daemon.cc
+	* configure.ac
+
 2009-09-23  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Removed unused methods Util::fileCopy(), Util::rangedFileCopy(),
diff --git a/configure.ac b/configure.ac
index 86a06763..3e7ed16b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -259,6 +259,7 @@ AC_CHECK_FUNCS([__argz_count \
                 __argz_next \
                 __argz_stringify \
                 atexit \
+                fork \
                 ftruncate \
                 getcwd \
                 gethostbyaddr \
diff --git a/src/daemon.cc b/src/daemon.cc
index 04b37e00..68e74770 100644
--- a/src/daemon.cc
+++ b/src/daemon.cc
@@ -43,6 +43,7 @@ namespace aria2 {
 int daemon(int nochdir, int noclose)
 {
   pid_t pid;
+#ifdef HAVE_FORK
   pid = fork();
   if(pid == -1) {
     return -1;
@@ -74,6 +75,7 @@ int daemon(int nochdir, int noclose)
       return -1;
     }
   }
+#endif // HAVE_FORK
   return 0;
 }