diff --git a/src/os/wait_unimp.go b/src/os/wait_unimp.go
index 802b032c6e..254bf7ec17 100644
--- a/src/os/wait_unimp.go
+++ b/src/os/wait_unimp.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin dragonfly freebsd nacl netbsd openbsd solaris
+// +build dragonfly freebsd nacl netbsd openbsd solaris
 
 package os
 
diff --git a/src/os/wait_linux.go b/src/os/wait_waitid.go
similarity index 71%
rename from src/os/wait_linux.go
rename to src/os/wait_waitid.go
index 7707539630..5dbd7f9766 100644
--- a/src/os/wait_linux.go
+++ b/src/os/wait_waitid.go
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// +build darwin linux
+
 package os
 
 import (
@@ -16,8 +18,11 @@ const _P_PID = 1
 // succeed immediately, and returns whether it has done so.
 // It does not actually call p.Wait.
 func (p *Process) blockUntilWaitable() (bool, error) {
-	// waitid expects a pointer to a siginfo_t, which is 128 bytes
-	// on all systems. We don't care about the values it returns.
+	// The waitid system call expects a pointer to a siginfo_t,
+	// which is 128 bytes on all GNU/Linux systems.
+	// On Darwin, it requires greater than or equal to 64 bytes
+	// for darwin/{386,arm} and 104 bytes for darwin/amd64.
+	// We don't care about the values it returns.
 	var siginfo [128]byte
 	psig := &siginfo[0]
 	_, _, e := syscall.Syscall6(syscall.SYS_WAITID, _P_PID, uintptr(p.Pid), uintptr(unsafe.Pointer(psig)), syscall.WEXITED|syscall.WNOWAIT, 0, 0)