diff --git a/src/Tiny_httpd_log.default.ml b/src/Tiny_httpd_log.default.ml
index bf801521..781772f0 100644
--- a/src/Tiny_httpd_log.default.ml
+++ b/src/Tiny_httpd_log.default.ml
@@ -4,3 +4,4 @@ let info _ = ()
 let debug _ = ()
 let error _ = ()
 let enable ~debug:_ () = ()
+let dummy = true
diff --git a/src/Tiny_httpd_log.logs.ml b/src/Tiny_httpd_log.logs.ml
index e55082ba..43d67fc8 100644
--- a/src/Tiny_httpd_log.logs.ml
+++ b/src/Tiny_httpd_log.logs.ml
@@ -14,3 +14,5 @@ let setup ~debug () =
          Logs.Debug
        else
          Logs.Info))
+
+let dummy = false
diff --git a/src/Tiny_httpd_log.mli b/src/Tiny_httpd_log.mli
index d610c817..5944e125 100644
--- a/src/Tiny_httpd_log.mli
+++ b/src/Tiny_httpd_log.mli
@@ -8,3 +8,5 @@ val setup : debug:bool -> unit -> unit
 (** Setup and enable logging. This should only ever be used in executables,
     not libraries.
     @param debug if true, set logging to debug (otherwise info) *)
+
+val dummy : bool
diff --git a/src/Tiny_httpd_server.ml b/src/Tiny_httpd_server.ml
index 95ed73f9..997baf43 100644
--- a/src/Tiny_httpd_server.ml
+++ b/src/Tiny_httpd_server.ml
@@ -844,6 +844,11 @@ let create_from ?(buf_size = 16 * 1_024) ?(middlewares = []) ~backend () : t =
 
 let is_ipv6_str addr : bool = String.contains addr ':'
 
+let str_of_sockaddr = function
+  | Unix.ADDR_UNIX f -> f
+  | Unix.ADDR_INET (inet, port) ->
+    Printf.sprintf "%s:%d" (Unix.string_of_inet_addr inet) port
+
 module Unix_tcp_server_ = struct
   type t = {
     addr: string;
@@ -858,11 +863,6 @@ module Unix_tcp_server_ = struct
     mutable running: bool; (* TODO: use an atomic? *)
   }
 
-  let str_of_sockaddr = function
-    | Unix.ADDR_UNIX f -> f
-    | Unix.ADDR_INET (inet, port) ->
-      Printf.sprintf "%s:%d" (Unix.string_of_inet_addr inet) port
-
   let to_tcp_server (self : t) : IO.TCP_server.builder =
     {
       IO.TCP_server.serve =
@@ -1044,6 +1044,16 @@ let client_handle_for (self : t) ~client_addr ic oc : unit =
 
       if Request.close_after_req req then continue := false;
 
+      (* how to log the response to this query *)
+      let log_response (resp : Response.t) =
+        if not Log.dummy then
+          Log.info (fun k ->
+              let elapsed = B.get_time_s () -. req.start_time in
+              k "response to=%s code=%d time=%.3fs"
+                (str_of_sockaddr client_addr)
+                resp.code elapsed)
+      in
+
       (try
          (* is there a handler for this path? *)
          let base_handler =
@@ -1081,6 +1091,7 @@ let client_handle_for (self : t) ~client_addr ic oc : unit =
            try
              if Headers.get "connection" r.Response.headers = Some "close" then
                continue := false;
+             log_response r;
              Response.output_ ~buf:buf_res oc r
            with Sys_error _ -> continue := false
          in
@@ -1088,15 +1099,22 @@ let client_handle_for (self : t) ~client_addr ic oc : unit =
          (* call handler *)
          try handler oc req ~resp with Sys_error _ -> continue := false
        with
-      | Sys_error _ -> continue := false
-      (* connection broken somehow *)
+      | Sys_error _ ->
+        (* connection broken somehow *)
+        Log.debug (fun k -> k "connection broken");
+        continue := false
       | Bad_req (code, s) ->
         continue := false;
-        Response.output_ ~buf:buf_res oc @@ Response.make_raw ~code s
+        let resp = Response.make_raw ~code s in
+        log_response resp;
+        Response.output_ ~buf:buf_res oc resp
       | e ->
         continue := false;
-        Response.output_ ~buf:buf_res oc
-        @@ Response.fail ~code:500 "server error: %s" (Printexc.to_string e))
+        let resp =
+          Response.fail ~code:500 "server error: %s" (Printexc.to_string e)
+        in
+        log_response resp;
+        Response.output_ ~buf:buf_res oc resp)
   done
 
 let client_handler (self : t) : IO.TCP_server.conn_handler =