diff --git a/pty_darwin.go b/pty_darwin.go
index f12e51f..c680479 100644
--- a/pty_darwin.go
+++ b/pty_darwin.go
@@ -14,7 +14,7 @@ const (
 
 // Opens a pty and its corresponding tty.
 func Open() (pty, tty *os.File, err os.Error) {
-	p, err := os.Open("/dev/ptmx", os.O_RDWR, 0)
+	p, err := os.OpenFile("/dev/ptmx", os.O_RDWR, 0)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -29,7 +29,7 @@ func Open() (pty, tty *os.File, err os.Error) {
 		return nil, nil, err
 	}
 
-	t, err := os.Open(sname, os.O_RDWR, 0)
+	t, err := os.OpenFile(sname, os.O_RDWR, 0)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -49,13 +49,12 @@ func ptsname(f *os.File) (string, os.Error) {
 	return "/dev/tty" + string([]byte{
 		ptdev1[minor(fi.Rdev)/32],
 		ptdev2[minor(fi.Rdev)%32],
-	}), nil
+	}),nil
 }
 
 
 func grantpt(f *os.File) os.Error {
-	p, err := os.StartProcess("/bin/ptchown", []string{"/bin/ptchown"},
-nil, "", []*os.File{f})
+	p, err := os.StartProcess("/bin/ptchown", []string{"/bin/ptchown"}, &os.ProcAttr{Files: []*os.File{f}})
 	if err != nil {
 		return err
 	}
diff --git a/pty_linux.go b/pty_linux.go
index 51fe28a..3f5e7ec 100644
--- a/pty_linux.go
+++ b/pty_linux.go
@@ -15,7 +15,7 @@ const (
 
 // Opens a pty and its corresponding tty.
 func Open() (pty, tty *os.File, err os.Error) {
-	p, err := os.Open("/dev/ptmx", os.O_RDWR, 0)
+	p, err := os.OpenFile("/dev/ptmx", os.O_RDWR, 0)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -30,7 +30,7 @@ func Open() (pty, tty *os.File, err os.Error) {
 		return nil, nil, err
 	}
 
-	t, err := os.Open(sname, os.O_RDWR, 0)
+	t, err := os.OpenFile(sname, os.O_RDWR, 0)
 	if err != nil {
 		return nil, nil, err
 	}
diff --git a/run.go b/run.go
index 30063a6..84a7c5f 100644
--- a/run.go
+++ b/run.go
@@ -23,7 +23,7 @@ func Run(name string, argv, envv []string, dir string) (c *exec.Cmd, err os.Erro
 	fd[1] = fd[0]
 	fd[2] = fd[0]
 	c.Stdout = c.Stdin
-	c.Process, err = os.StartProcess(name, argv, envv, dir, fd[:])
+	c.Process, err = os.StartProcess(name, argv, &os.ProcAttr{Env: envv, Dir: dir, Files: fd[:]})
 	fd[0].Close()
 	if err != nil {
 		c.Stdin.Close()