diff --git a/ChangeLog b/ChangeLog
index a0764b1d4..0a9e6be20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-06  Matthias Clasen  <mclasen@redhat.com>
+
+	* glib/gspawn.c (fdwalk): Don't set open_max to
+	RLIM_INFINITY.  (#495589, Tommi Komulainen)
+
 2008-01-06  Matthias Clasen  <mclasen@redhat.com>
 
 	* README.in, INSTALL.in: Document new dependencies.
diff --git a/glib/gspawn.c b/glib/gspawn.c
index e545b4e75..9fc3ac87a 100644
--- a/glib/gspawn.c
+++ b/glib/gspawn.c
@@ -941,7 +941,7 @@ fdwalk (int (*cb)(void *data, int fd), void *data)
   
 #ifdef HAVE_SYS_RESOURCE_H
       
-  if (getrlimit(RLIMIT_NOFILE, &rl) == 0)
+  if (getrlimit(RLIMIT_NOFILE, &rl) == 0 && rl.rlim_max != RLIM_INFINITY)
       open_max = rl.rlim_max;
   else
 #endif