diff --git a/serverutil/http.go b/serverutil/http.go
index 692ec5b6fd5e6caf7e591721c0c44eb952a87e37..3975b21c9f0fd194dc03311829bf38a64a840f82 100644
--- a/serverutil/http.go
+++ b/serverutil/http.go
@@ -72,11 +72,10 @@ func (config *ServerConfig) buildHTTPServer(h http.Handler) (*http.Server, error
 	// can be generous with the timeouts to keep the number of
 	// reconnections low.
 	return &http.Server{
-		Handler:      addDefaultHandlers(h),
-		ReadTimeout:  30 * time.Second,
-		WriteTimeout: 30 * time.Second,
-		IdleTimeout:  600 * time.Second,
-		TLSConfig:    tlsConfig,
+		Handler:           addDefaultHandlers(h),
+		ReadHeaderTimeout: 30 * time.Second,
+		IdleTimeout:       600 * time.Second,
+		TLSConfig:         tlsConfig,
 	}, nil
 }