diff --git a/internal/log/middleware.go b/internal/log/middleware.go
index ac6df227d..4925e8802 100644
--- a/internal/log/middleware.go
+++ b/internal/log/middleware.go
@@ -9,6 +9,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/pomerium/pomerium/internal/middleware/responsewriter"
 	"github.com/rs/zerolog"
 )
 
@@ -164,7 +165,7 @@ func AccessHandler(f func(r *http.Request, status, size int, duration time.Durat
 	return func(next http.Handler) http.Handler {
 		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 			start := time.Now()
-			lw := NewWrapResponseWriter(w, r.ProtoMajor)
+			lw := responsewriter.NewWrapResponseWriter(w, r.ProtoMajor)
 			next.ServeHTTP(lw, r)
 			f(r, lw.Status(), lw.BytesWritten(), time.Since(start))
 		})
diff --git a/internal/log/wrap_writer.go b/internal/middleware/responsewriter/wrap_writer.go
similarity index 98%
rename from internal/log/wrap_writer.go
rename to internal/middleware/responsewriter/wrap_writer.go
index 04fd4cf4d..00432c240 100644
--- a/internal/log/wrap_writer.go
+++ b/internal/middleware/responsewriter/wrap_writer.go
@@ -1,4 +1,4 @@
-package log // import "github.com/pomerium/pomerium/internal/log"
+package responsewriter
 
 // The original work was derived from Goji's middleware, source:
 // https://github.com/zenazn/goji/tree/master/web/middleware
diff --git a/internal/log/wrap_writer_test.go b/internal/middleware/responsewriter/wrap_writer_test.go
similarity index 91%
rename from internal/log/wrap_writer_test.go
rename to internal/middleware/responsewriter/wrap_writer_test.go
index e26e6feed..e65d25ddf 100644
--- a/internal/log/wrap_writer_test.go
+++ b/internal/middleware/responsewriter/wrap_writer_test.go
@@ -1,4 +1,4 @@
-package log // import "github.com/pomerium/pomerium/internal/log"
+package responsewriter
 
 import (
 	"net/http/httptest"