src/pkg/archive/zip/reader.go | 2 +-
 src/pkg/archive/zip/writer.go | 4 ++--

diff --git a/src/pkg/archive/zip/reader.go b/src/pkg/archive/zip/reader.go
index 4dd0f4f434421a8d8b1f473ffa1086e4a0f1c0c0..c3009869b60a0d17d12fe49f27246c4a7625e7b1 100644
--- a/src/pkg/archive/zip/reader.go
+++ b/src/pkg/archive/zip/reader.go
@@ -117,7 +117,7 @@ 	return rc.f.Close()
 }
 
 // Open returns a ReadCloser that provides access to the File's contents.
-// It is safe to Open and Read from files concurrently.
+// Multiple files may be read concurrently.
 func (f *File) Open() (rc io.ReadCloser, err error) {
 	bodyOffset, err := f.findBodyOffset()
 	if err != nil {
diff --git a/src/pkg/archive/zip/writer.go b/src/pkg/archive/zip/writer.go
index b1b128e2a7da406c7ef11d91e5ba9734a71b2859..a4f0654474a6711f097da434fdd3e3abfcd8e330 100644
--- a/src/pkg/archive/zip/writer.go
+++ b/src/pkg/archive/zip/writer.go
@@ -19,7 +19,7 @@ // TODO(adg): support specifying deflate level
 
 // Writer implements a zip file writer.
 type Writer struct {
-	*countWriter
+	countWriter
 	dir    []*header
 	last   *fileWriter
 	closed bool
@@ -32,7 +32,7 @@ }
 
 // NewWriter returns a new Writer writing a zip file to w.
 func NewWriter(w io.Writer) *Writer {
-	return &Writer{countWriter: &countWriter{w: bufio.NewWriter(w)}}
+	return &Writer{countWriter: countWriter{w: bufio.NewWriter(w)}}
 }
 
 // Close finishes writing the zip file by writing the central directory.