diff --git a/src/cmd/godoc/godoc.go b/src/cmd/godoc/godoc.go
index 812d23824e..0ec85991e5 100644
--- a/src/cmd/godoc/godoc.go
+++ b/src/cmd/godoc/godoc.go
@@ -995,6 +995,9 @@ func serveFile(c *http.Conn, r *http.Request) {
 	}
 
 	if dir != nil && dir.IsDirectory() {
+		if redirect(c, r) {
+			return
+		}
 		if index := path + "/index.html"; isTextFile(index) {
 			serveHTMLDoc(c, r, index)
 			return