diff --git a/server.go b/server.go
index 095437e..27e1d8d 100644
--- a/server.go
+++ b/server.go
@@ -220,6 +220,9 @@ func (s *Server) respond(conn net.Conn) {
 		}
 	}
 
+	// Store remote address
+	req.RemoteAddr = conn.RemoteAddr()
+
 	resp := s.responder(req)
 	if resp == nil {
 		w.Status(StatusNotFound)