diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index ea1677d2ce9..537536daf63 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,8 @@
 2002-02-07  Tom Tromey  <tromey@redhat.com>
 
+	* include/name-finder.h: Conditionally include sys/wait.h.
+	* include/config.h.in: Rebuilt.
+
 	* java/io/natFile.cc (_access): Don't stack-allocate buffer.
 	Size buffer based on real size of string.
 	(_stat): Likewise.
diff --git a/libjava/include/config.h.in b/libjava/include/config.h.in
index 429e1ce83ca..94d3b60a180 100644
--- a/libjava/include/config.h.in
+++ b/libjava/include/config.h.in
@@ -13,6 +13,9 @@
 /* Define if you have <alloca.h> and it should be used (not on Ultrix).  */
 #undef HAVE_ALLOCA_H
 
+/* Define if you have <sys/wait.h> that is POSIX.1 compatible.  */
+#undef HAVE_SYS_WAIT_H
+
 /* Define if your struct tm has tm_zone.  */
 #undef HAVE_TM_ZONE
 
diff --git a/libjava/include/name-finder.h b/libjava/include/name-finder.h
index f2a9aa1587e..46ae20a3293 100644
--- a/libjava/include/name-finder.h
+++ b/libjava/include/name-finder.h
@@ -1,6 +1,6 @@
 // name-finder.h - Convert addresses to names
 
-/* Copyright (C) 2000  Red Hat Inc
+/* Copyright (C) 2000, 2002  Free Software Foundation, Inc
 
    This file is part of libgcj.
 
@@ -18,7 +18,9 @@ details.  */
 
 #include <sys/types.h>
 
+#ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>
+#endif
 
 #include <string.h>
 #include <stdio.h>