diff --git a/ChangeLog b/ChangeLog
index 41c53b729..04a029cb6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-18  Tor Lillqvist  <tml@novell.com>
+
+	* configure.in: Check for <sys/wait.h>
+
+	* glib/gbacktrace.c: Include <sys/wait.h> on if HAVE_SYS_WAIT_H.
+
 2005-08-18  Ross Burton  <ross@burtonini.com>
 
 	* glib/gstring.c:
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 41c53b729..04a029cb6 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2005-08-18  Tor Lillqvist  <tml@novell.com>
+
+	* configure.in: Check for <sys/wait.h>
+
+	* glib/gbacktrace.c: Include <sys/wait.h> on if HAVE_SYS_WAIT_H.
+
 2005-08-18  Ross Burton  <ross@burtonini.com>
 
 	* glib/gstring.c:
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 41c53b729..04a029cb6 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+2005-08-18  Tor Lillqvist  <tml@novell.com>
+
+	* configure.in: Check for <sys/wait.h>
+
+	* glib/gbacktrace.c: Include <sys/wait.h> on if HAVE_SYS_WAIT_H.
+
 2005-08-18  Ross Burton  <ross@burtonini.com>
 
 	* glib/gstring.c:
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 41c53b729..04a029cb6 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2005-08-18  Tor Lillqvist  <tml@novell.com>
+
+	* configure.in: Check for <sys/wait.h>
+
+	* glib/gbacktrace.c: Include <sys/wait.h> on if HAVE_SYS_WAIT_H.
+
 2005-08-18  Ross Burton  <ross@burtonini.com>
 
 	* glib/gstring.c:
diff --git a/configure.in b/configure.in
index 43af69f3a..b263a1f52 100644
--- a/configure.in
+++ b/configure.in
@@ -772,7 +772,7 @@ AC_C_BIGENDIAN
 
 # check for header files
 AC_CHECK_HEADERS([dirent.h float.h limits.h pwd.h sys/param.h sys/poll.h sys/select.h sys/types.h])
-AC_CHECK_HEADERS([sys/time.h sys/times.h unistd.h values.h stdint.h sched.h])
+AC_CHECK_HEADERS([sys/time.h sys/times.h sys/wait.h unistd.h values.h stdint.h sched.h])
 
 # Checks for libcharset
 jm_LANGINFO_CODESET
diff --git a/glib/gbacktrace.c b/glib/gbacktrace.c
index a60e319d2..76bb5aa56 100644
--- a/glib/gbacktrace.c
+++ b/glib/gbacktrace.c
@@ -45,7 +45,9 @@
 #include <sys/times.h>
 #endif
 #include <sys/types.h>
+#ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>
+#endif
 
 #include <time.h>
 #ifdef HAVE_UNISTD_H