src/pkg/go/parser/parser.go | 5 ++++-

diff --git a/src/pkg/go/parser/parser.go b/src/pkg/go/parser/parser.go
index 181ac65046f972436139141eb9c5113a68fd2dc9..76e9783637faca976e2a246afceb587fb2b5edbb 100644
--- a/src/pkg/go/parser/parser.go
+++ b/src/pkg/go/parser/parser.go
@@ -81,7 +81,10 @@ 	p.scanner.Init(filename, src, p, scannerMode(mode))
 	p.mode = mode
 	p.trace = mode&Trace != 0 // for convenience (p.trace is used frequently)
 	if scope != nil {
-		p.checkDecl = true
+		// Disabled for now.  Causes error with "godoc http":
+		//    parser.parseDir: src/pkg/http/server.go:159:16: 'Write' declared already at src/pkg/http/request.go:140:21 (and 4 more errors)
+
+		// p.checkDecl = true
 	} else {
 		scope = ast.NewScope(nil) // provide a dummy scope
 	}